minor modifications
Merge branch 'master' of github.com:orthez/config

Conflicts:
	.vim/bundle/syntastic