merges updated seeds file from master
merges some updates from master
Updates schema, updates gems.