updating rake tasks for production
merge conflicts on db/schema