Better canhaz, improvements for envoy
Merge branch 'master' of github.com:vvMINOvv/dotfiles