Exit properly
Merge branch 'master' of https://github.com/happyaron/dotfiles