move around some deck chairs in an attempt to undo the postmodern-ass directory structure we ended up with
Merge branch 'master' of github.com:vogon/words
server-side fix for the empty poem bug