Remove conflicting greplace submodule
Merge branch 'master' of github.com:Terr/dotfiles