New, more clean version of .bash_profile
merge
Merge branch 'master' of https://github.com/andmos/dotfiles