quite some changes...
Merge branch 'master' of github.com:urso/vimrc