Merge pull request #1 from gregleaver/macbook

Merge from Macbook
Turn on omnifunc
Install ctrlp
Fix bad commit of changes to gitmodules.
Merge branch 'master' into macbook

Conflicts:
	.gitmodules
Change default colorscheme