Make unicorn the default development server
Merge ../x0y0

Conflicts:
	Gemfile.lock