Merge branch 'release/1.0.1-b6'
Merge branch 'release/1.0.1-b7'
Merge branch 'release/1.0.1-b8'
Merge branch 'release/1.0.1-b9'
Merge branch 'release/1.0.1-b10'
Citations fix AND JSON error fix for newer postgres

the citations code was easy.  the JSON fix took all day!
oops

must've hit delete just before committing.  lost a paren. caused a sync
error.
what the hell, it was opposite day when I set the MEDIA_URL
didn't pass travis

trying again
travis again

is there a way to do this with out commits?
trying again

test
giving up on the in-migrate fix

it ought to be a separate script, anyway.
flake 8 errors

minor changes
final flake 8 fixes

at least I don't get errors from "make test" locally.
Citations fix AND JSON error fix for newer postgres

the citations code was easy.  the JSON fix took all day!
oops

must've hit delete just before committing.  lost a paren. caused a sync
error.
what the hell, it was opposite day when I set the MEDIA_URL
didn't pass travis

trying again
travis again

is there a way to do this with out commits?
trying again

test