Fix syntax errors in vimrc
Merge branch 'master' of https://github.com/sthoma/dotfiles
Add gs alias