Ruby 2.1 =)
Add capistrano, vagrantfile and puppet conf =)
Add unicorn config
Change col-lg to col-md
Merge ../x0y0

Conflicts:
	Capfile
	Gemfile
	Gemfile.lock
	Vagrantfile
	config/deploy.rb
	config/deploy/production.rb
	config/environments/sandbox.rb
	puppet