Missing changes from marvin branch
"Finished" install script.

Not elegant, but it works
Minor update to install.zsh
Merge remote-tracking branch 'origin/marvin'

Conflicts:
	.vimrc
	.vundlerc
	install.zsh

Second master <- marvin merge.  I messed up the first aparently.