update settings
Merge branch 'master' of github.com:sigilioso/.vim
several updates