Merge branch 'master' of github.com:soto97/dotfiles

This merge is required to combine previous changes for the Linux portion
of the bash_config file with the most recent changes for the OS X
portion of the bash_config files. This was a straightforward merge that
was done automatically with no need for human intervention nor
confirmation.

	modified:   bash_config
Merge branch 'master' of github.com:soto97/dotfiles