Reintroduced 'seeds' file, not sure what I was thinking.
Merge branch 'master' into rails-four.