bashrc
Merge branch 'master' of https://github.com/perrygeo/config-files