still troubleshooting
Merge branch 'moar'
Merge branch 'master' of github.com:eugmill/milkman
fixed minor issues