encoding adaptions
Merge branch 'master' of https://github.com/biluncloud/_vimrc
remove unneccessary bundles, include ultisnips