Upgrade to ruby 2.1.1
Upgrade to ruby 2.1.1
Update to rails 4.1
Use fork of sprockets_better_errors
Update to rails 4.1.1
Add Procfile with thin for web role
Merge branch 'master' into capistrano

Conflicts:
	Gemfile.lock
Update to latest release of capistrano3-puma
Set capistrano deploy_to
Add puma config
Remove thin since we're not using it
Set capstrano to deploy the current branch