added modelines
Merge branch 'master' of github.com:fergusb/vim

Conflicts:
	vimrc