Updates.
Merge branch 'master' of github.com:quincy/vimconfig

Conflicts:
	.gitmodules
Updated syntastic.