added seeds to generator
Merge branch 'master' into rails-3-compat