Add capistrano gem for deployment
Run cap install
Set environment urls
Add capistrano3-puma gem
Require capistrano 3 puma gem

Conflicts:
	config/deploy.rb
Setup capistrano
Update to capistrano3-puma master
Add pry-byebug gem
Setup vagrant deploy
Upgrade to ruby 2.1.1
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
Add capistrano-bundler gem
Add a vagrant environment and database config
Update capistrano
Remove extraneous puma config