Test
Use Ruby 1.9.3
Add Procfile
Add unicorn
Add Unicorn config
Merge branch 'cedar'

Conflicts:
	Gemfile