more fixes
Merge branch 'master' of github.com:robled/dotfiles-desktop