Add vim plugins, and nitrous.io alias to bashrc
Merge branch 'master' of https://github.com/smcabrera/castillo-cabrera

Conflicts:
	home/.bashrc