Generated master for commit ad9a26f
Merge: 2989d48 3d0fa48
Author: Anthony Scopatz <scopatz@gmail.com>

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