Updates vimrc and install script
Merge branch 'master' into osx

Conflicts:
	install.sh