New version
Merge branch 'master' of github.com:maxmeyer/vim-deg-conf

Conflicts:
	plugin/options.vim
	plugin/pluginoptions.vim