Trim fat on bash_aliases, add keychain to bashrc
Merge branch 'master' of github.com:bjmcculloch/dotfiles