Generated master for commit 7166521
Author: gidden <matthew.gidden@gmail.com>

    addressed @gonuke's comments
Generated master for commit 800977c
Author: gidden <matthew.gidden@gmail.com>

    added comments from a discussion with @scopatz and @rwcarlsen as well as an abstract
Generated master for commit 78f6d51
Author: Anthony Scopatz <scopatz@gmail.com>

    accpeted cep20
Generated master for commit 1727698
Author: Robert Carlsen <rwcarlsen@gmail.com>

    accepted cep3
Generated master for commit ccd9667
Author: Matthew Gidden <matthew.gidden@gmail.com>

    accepted->draft for cep21
Generated master for commit ccd9667
Author: Matthew Gidden <matthew.gidden@gmail.com>

    accepted->draft for cep21
Generated master for commit 1b0eb00
Author: Anthony Scopatz <scopatz@gmail.com>

    accepted cep21
Generated master for commit 40f9676
Merge: cf3d344 b12e12e
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Merge pull request #90 from gonuke/add_batlab
Generated master for commit d8ea2d9
Merge: b31c788 40f9676
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge branch 'source' of github.com:cyclus/cyclus.github.com into source
Generated master for commit bd16db0
Author: Robert Carlsen <rwcarlsen@gmail.com>

    added info on viewing databases. fixed missing newline errors
Generated master for commit 1772186
Merge: bd16db0 2ba94d1
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #92 from katyhuff/pubs
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 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"
Generated master for commit 4cb74bd
Author: Katy Huff <katyhuff@gmail.com>

    better wording about citations"
Generated master for commit 2c7b2ad
Author: Anthony Scopatz <scopatz@gmail.com>

    added dbtypes
Generated master for commit 2c7b2ad
Author: Anthony Scopatz <scopatz@gmail.com>

    added dbtypes
Generated master for commit 037a773
Author: Matthew Gidden <matthew.gidden@gmail.com>

    fixed drep code typo