Generated master for commit d6f7291
Merge: ed1ad9d f88da09
Author: Anthony Scopatz <scopatz@gmail.com>

    Merge branch 'source' of github.com:cyclus/cyclus.github.com into source