git config modified by Source Tree app and .bashrc modified by me.
Merge branch 'master' of https://github.com/jmrbcu/dotfiles
Added support for python 2.7