Fixing conflicts

.bash_profile

@@ -13,11 +13,6 @@ export PATH="/usr/local/sbin:/usr/sbin:/opt/sbin:/sbin:$PATH"
 export VISUAL="$EDITOR"
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
-# Add bin directories to PATH.
-[ -d ~/.local/bin ] && export PATH="~/.local/bin:$PATH"
-[ -d ~/bin ] && export PATH="~/bin:$PATH"
-[ -d ~/files/bin ] && export PATH="~/files/bin:$PATH"
-
 # Platform specific set up.
 _PLATFORM="$(uname -s)"
 if [ "$_PLATFORM" = "Linux" ]; then
@@ -27,12 +22,17 @@ if [ "$_PLATFORM" = "Linux" ]; then
 elif [ "$_PLATFORM" = "Darwin" ]; then
   export LSCOLORS="ExGxdxdxCxDxDxbcacbeae"
   export MANPATH="/opt/local/share/man:$MANPATH"
-  export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
+  export PATH="/opt/local/sbin:/opt/local/bin:$PATH"
 else
   echo "${BASH_SOURCE##*/}: unsupported platform: $_PLATFORM" >&2
 fi
 unset _PLATFORM
 
+# Add bin directories to PATH.
+[ -d ~/files/bin ] && export PATH="~/files/bin:$PATH"
+[ -d ~/.local/bin ] && export PATH="~/.local/bin:$PATH"
+[ -d ~/bin ] && export PATH="~/bin:$PATH"
+
 # SSH agent.
 hash ssh-add ssh-agent >/dev/null 2>&1 && {
   if [ ! -z "$SSH_AUTH_SOCK" ]; then

.gitignore

@@ -1,2 +1,5 @@
 *~
 *.save
+NOTES
+.ssh/id_rsa
+.ssh/id_ed25519

.ssh/config

@@ -23,9 +23,9 @@ Host *
   # AddKeysToAgent		yes
   ConnectTimeout		30
 # Removed as this prevents use of ^Z suspension.
-# ControlMaster			auto
-# ControlPath			~/.ssh/%u@%l->%r@%h:%p
-# ControlPersist		7200
+#  ControlMaster		auto
+#  ControlPath			~/.ssh/%u@%l->%r@%h:%p
+#  ControlPersist		7200
   ExitOnForwardFailure		yes
   ForwardX11Trusted		no
   SendEnv			LANG LC_* TERM