cleanup config
Merge branch 'master' of https://github.com/carmi/dotfiles-1