various macbook changes
Merge branch 'master' of github.com:Gidgidonihah/.dotfiles

Conflicts:
	.bashrc
	.vimrc