update seed file, and tweaked user associations so the seed would work
Merge branch 'master' into seed-file