Generated master for commit 9cfaafe
Author: opotowsky <arrielle.opotowsky@gmail.com>

    linking to cnerg page (because I'm not cool enough to have my own website yet)
Generated master for commit 6955f4f
Author: Robert Carlsen <rwcarlsen@gmail.com>

    add some new sqliteback types for v1.1.
Generated master for commit 9155d71
Merge: 53ba8f6 3c83c5d
Author: Katy Huff <katyhuff@gmail.com>

    merge conflicts from my own source branch.
Generated master for commit 4cb74bd
Author: Katy Huff <katyhuff@gmail.com>

    better wording about citations"