actually return json
Merge branch 'master' of github.com:seshness/happyminions