Improved bash_profile
Merge branch 'master' of https://github.com/marcuswestin/dotfiles

Conflicts:
	files-Home/bash_profile