stupid new feature doesnt work on old git
Merge branch 'master' of github.com:ediblenergy/dotfiles