Merge remote-tracking branch 'github/master'

bash_aliases.d/git

@@ -28,6 +28,9 @@ function git-config-joshs()
   git config --global init.defaultBranch master
   # Only use configured user.name/user.email; do not guess them
   git config --global user.useConfigOnly true
+  # Do not automatically mark my branch as tracking the remote branch that I
+  # happened to use as the starting point.
+  git config --global branch.autoSetupMerge false
 }
 function git-config-local-personal()
 {

bash_profile

@@ -0,0 +1,2 @@
+source $HOME/.profile
+source $HOME/.bashrc

install-files

@@ -21,6 +21,9 @@ def install_file(src, dst):
 
 files = [
         ('bash_aliases', '.bash_aliases'),
+        ('bash_aliases.d', '.bash_aliases.d'),
+        ('bash_profile', '.bash_profile'),
+        ('profile', '.profile'),
         ('inputrc', '.inputrc'),
         ('screenrc', '.screenrc'),
         ('gitignore', '.gitignore'),

profile

@@ -0,0 +1,2 @@
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+export PATH="$HOME/bin":"$PATH"