Various small changes
Merge branch 'develop' of github.com:renajohn/vimate into develop

Conflicts:
	vimrc