Specify a ruby & gemset
use thin
Merge branch 'master' of github.com:theodi/deployment-test-app

Conflicts:
	Gemfile
Merge branch 'refs/heads/master' into new-upstart

Conflicts:
	Gemfile
	Gemfile.lock