add test_update_content
Merge branch 'master' into develop
remove accidental set_trace
add dictify methods to models
some refactoring of meme handling, update tests, build now passes