1. No idea why but i just did.
Merge branch 'master' of github.com:bpearson/profile

Conflicts:
	vimrc