Start merge .vimrc from linux machine
Merge Linux .vimrc changes
Merge branch 'master' of https://github.com/fmahnke/fritz-vim
Fix powerline