Update gem file to only use sqlite in dev, Postgres in prod
Added gemfile.lock
Added travis-ci auto deploy to heroku
Updated Travis-CI build status icon
Added db:migrate to travis config
Specified ruby version
Added rails_12factor gem to load assets on heroku
Updated travis-ci ruby version
Updated to ruby version 2.1.5
Merge remote-tracking branch 'origin/master' into user-authentication

Conflicts:
	Gemfile.lock