you can now edit an item and it, uh, works
Merge branch 'master' into gh-pages