more updates
revert to cap 2 setup
Merge branch 'master' of github.com:daniel-jerome-long/djl

Conflicts:
	.gitignore
	Capfile
	Gemfile
	Gemfile.lock
	config/deploy.rb
	config/initializers/secret_token.rb
	config/unicorn.rb