seed data and migration cleanup
Merge branch 'master' into seed_data
Merge pull request #12 from shidel-dev/seed_data

seed data and migration cleanup