Added deploy to production
Merge branch 'master' into production
Remove special version in prod
Merge branch 'master' into production
Lock rgeo here
Merge branch 'master' into production
Not just jersey
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
CC can be invalid
Merge branch 'master' into production

Conflicts:
	lib/pelias/tasks/quattroshapes.rake
Merge branch 'master' into production
Merge branch 'master' into production
Quattroshapes on Sidekiq
Merge branch 'master' into production

Conflicts:
	lib/pelias/location_indexer.rb
	lib/pelias/tasks/quattroshapes.rake
Merge branch 'production' of github.com:mapzen/pelias