Make .profile work in Linux ZSH
Merge branch 'master' of git://github.com/HerbCSO/dotfiles

Conflicts:
	bash/profile