Fix gitconfig;
Merge branch 'master' of https://github.com/naspeh/dotfiles