Add Gemfile.lock
Don't force sqlite and thin in production
Disable compass
Add pg
Add active_record
Merge master
Fix deprecation
Use postgres for Heroku support