Can now add and update categories

- This'll make it easy to do pre-write-a-thon
- Did a bit of clean up along the way
Merge branch 'add-edit-categories'