local changes
Merge branch 'master' of https://github.com/jongman/vim-setup

Conflicts:
	vim/bundle/syntastic