minor
Merge branch 'master' of github.com:IanFinlayson/config

Conflicts:
	vim/spell/en.utf-8.add