Update 1.1, new plugins, minor tweaks
Merge branch 'master' of github.com:mvanleeuwen/vim-settings