cleaned up
Merge branch 'master' of github.com:Morriz/dotfiles