Updated work (moved to zshuery)
Merge branch 'master' of http://github.com/tuxedocat/dotfiles