Took care of issue#35
Ran the migrations from scratch again, follow up on issue# 35
Merge pull request #39 from gaurimishra/migration-fixups

Merging PR #39 - Fixes #35