updated seeds
initial update to Rails 4.1.7
Rails 4.1.7 update sort of runs
fixed merge