config and theme changed
Merge branch 'master' of https://github.com/volonter/vimrc