Updating path requirements for OSX
Merge branch 'master' of github.com:danndalf/.dotfiles

Conflicts:
	src/bashrc
Fixing merge on .profile