vim configs
Merge branch 'master' of github.com:lbolla/dotfiles

Conflicts:
	.vim/ftplugin/javascript.vim
	.vimrc