A few changes and optimizations
Merge branch 'master' of https://github.com/benekastah/osx-bootstrap

Conflicts:
	home/.vimrc