Merge branch 'master' of github.com:kmcculloch/bash_config