Impose consistency with source update
sync with source
Update README to match workflow
Merge pull request #10 from CNERG/generalize_doc_build_master

Generalize doc build master
Sync Makefile with source branch
Generated master for commit be8389a
Merge: c2d295e 0115aee
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #12 from CNERG/update_build
Generated master for commit 6253711
Merge: be8389a 23cdc99
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge pull request #13 from CNERG/resolve_errors
Generated master for commit ebe1b84
Merge: 534fe41 36aa332
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Merge pull request #15 from scopatz/source
Generated master for commit d9eb291
Author: Lucas John Jacobson <lucasj@nexus.cae.wisc.edu>

    added jacobson as a person
Generated master for commit 01093c3
Author: Paul P.H. Wilson <wilsonp@engr.wisc.edu>

    Minor formatting changes
Generated master for commit 62d8918
Author: Paul P.H. Wilson <wilsonp@engr.wisc.edu>

    downsize photo on Kalin's page
Generated master for commit 4a00095
Merge: 62d8918 c020d8c
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Merge pull request #20 from CNERG/resolve_errors
Generated master for commit 47fc046
Author: opotowsky <arrielle.opotowsky@gmail.com>

    updating arrielle's file and main
Generated master for commit 4259176
Author: Elliott Biondo <elliott.biondo@gmail.com>

    Added picture, minor change to info page.
Generated master for commit 3b77b8a
Author: Paul P.H. Wilson <wilsonp@engr.wisc.edu>

    Remove emacs backup file from repository
Generated master for commit aa92be7
Merge: 3b77b8a 3429b76
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Merge pull request #23 from CNERG/add_ACI_url
Generated master for commit c3c94a9
Author: moatazharb <mharb@wisc.edu>

    Added reference in list of all people
Generated master for commit b51d822
Merge: c3c94a9 fa9a25f
Author: gidden <matthew.gidden@gmail.com>

    Merge pull request #29 from gonuke/add_video
Generated master for commit 8289c1f
Merge: b51d822 834f8ba
Author: Paul P.H. Wilson <wilsonp@engr.wisc.edu>

    Merge remote-tracking branch 'origin/new_cyclus_postdoc' into source
Generated master for commit 7a37ab1
Merge: 8289c1f 79783be
Author: Paul Wilson <wilsonp@engr.wisc.edu>

    Merge pull request #30 from CNERG/add_april_2014_news