Work on retrogen
Fixup retrogen and oregen
Merge pull request #2 from CoFH/master

sync branch