Changes to mirror
Merge branch 'master' of https://github.com/spitlo/dotfiles