updated dotfiles
Merge branch 'master' of https://github.com/rvalente/dotfiles

* 'master' of https://github.com/rvalente/dotfiles:
  updated

Conflicts:
	.vim/bundle/ctrlp
	.vim/bundle/syntastic