Ugh, this is going to be messy.
Merge branch 'master' of https://github.com/green0eggs/ConfigFiles
Hopefully resolved this
Conflicts:
	.vimrc