Removed Faker for Heroku upload
Updated gems
Removed kronic
Fixing merge problems