use puma.

Using thin and unicorn is silly
Specify a version for puma and bundle
Merge remote-tracking branch 'upstream/use_puma'

Conflicts:
	Gemfile.lock