fixes the missing i18n gem
Improves the config/database.yml file
updates rails to 3.2.17
adds .env.sample file.
adds .env.example
Merge pull request #1 from hybridgroup/6-updated-from-original

6 updated from original
merges from heroku repo
loads dotenv only if rails env is not production
Merge branch 'master' of https://github.com/hybridgroup/clahub
Resolved conflicts at update
Ignoring database config file
Merge from origin
updates sass-rails gem to fix EOF error in application.scss because of incompatibility with v2.3.0
Merge branch 'master' of https://github.com/hybridgroup/clahub
Solved conflicts