Updated vimrc.
Merge branch 'master' of https://github.com/maximilian2013/dotfiles