Disable snipmate, vim terminal and nvm path
Merge branch 'master' of github.com:anark/dotfiles

Conflicts:
	vimrc.before