Gemfile & Timezone
merge from heroku