Little refactoring, create users is effed.  Needs some work.
Merge branch 'master' of https://github.com/wgoyer/DataGenerator