Dictionary changes
Lots of new plugins, and rearranging of vimrc
Merge branch 'master' of github.com:zirrostig/dotvim

Conflicts:
	vimrc