added labels
Merge branch 'master' of https://github.com/cyclus/cyclist2