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