updated to match the todo list reqs
Merge branch 'apiv2' of https://github.com/renns/bennu into apiv2