-
Merge branch 'master' of github.com:maxgronlund/digiramp

Conflicts:
	Gemfile
	Gemfile.lock
	config/deploy/production.rb
	config/deploy/shared/sidekiq.yml.erb