syntastic and some other fixes
Merge branch 'master' of github.com:ninjabiscuit/dotfiles

Conflicts:
	.gitmodules