Fix conky wifi for "box";
Hide shortcuts from conky if xfce;
Merge branch 'master' of github.com:naspeh/dotfiles