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