merge
Merge branch 'master' of http://github.com/kmalloc/vim

Conflicts:
	spell/en.utf-8.add
	spell/en.utf-8.add.spl
Merge branch 'master' of http://github.com/kmalloc/vim