Updating
Merge branch 'master' of github.com:samgiles/vim-setup