Updates vimrc and install script
Merge branch 'master' into debian-dreamhost

Conflicts:
	vimrc