Merge pull request #15 from scopatz/rema

some cleanup - thanks!
Merge branch 'master' of https://github.com/cyclus/cyclist2
merged with yarden