Some nice changes
Merge branch 'master' of https://github.com/vaterp/dotfiles