Fix bash_profile conflict
Merge branch 'master' of github.com:emson/dotfiles
Merge branch 'master' of github.com:emson/dotfiles