Merge pull request #14 from wilchandler/standards-seed-files

Standards seed files
added user type to migrations
Fixed merge conflicts.