Fixed install script
Massive update
Merge branch 'master' of github.com:Grimy/vimfiles

Conflicts:
	vimrc