Generated master for commit 9de969b
Merge: 153e11e e38d8cd
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #27 from gidden/remote_fix
Merge branch 'master' of github.com:cyclus/cyclus.github.com
Generated master for commit 9de969b
Merge: 153e11e e38d8cd
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #27 from gidden/remote_fix
Synchronize the master branch with updated build process.
Generated master for commit 5728707
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Changed CEP-2 to accepted.
Sync master branch with source branch build process.
Merge pull request #33 from cyclus/sync_final_build_changes

Sync final build changes
rmed .gitignore
Generated master for commit 1ea1012
Author: Anthony Scopatz <scopatz@gmail.com>

    updated CEP0
Generated master for commit 1040353
Author: Anthony Scopatz <scopatz@gmail.com>

    accepting cep17
Generated master for commit 47bbd05
Author: Anthony Scopatz <scopatz@gmail.com>

    rm'd cep18 dir
Generated master for commit 6da0128
Author: Matthew Gidden <matthew.gidden@gmail.com>

    fixed numeral typo
Generated master for commit 8d0f5cf
Author: Matthew Gidden <matthew.gidden@gmail.com>

    revised cep18 to address many of @scopatz's comments, namely consistent terminology w.r.t. proposals and bids, clarficiation of the request constraitns, and a proposed solution to the unknowns.
Generated master for commit 4c3c417
Author: Matthew Gidden <matthew.gidden@gmail.com>

    updated cep18 to further address @scopatz's comments
Generated master for commit 81e7ce0
Author: Matthew Gidden <matthew.gidden@gmail.com>

    updated cep18 with datastructure implementation
Generated master for commit 686f2ce
Author: Anthony Scopatz <scopatz@gmail.com>

    fixed cep18 build error
Merge branch 'master' of github.com:cyclus/cyclus.github.com
Generated master for commit 686f2ce
Author: Anthony Scopatz <scopatz@gmail.com>

    fixed cep18 build error
Generated master for commit edd0e59
Author: gidden <matthew.gidden@gmail.com>

    updated cep18
Generated master for commit c0274ed
Author: gidden <matthew.gidden@gmail.com>

    fixed a headline