CC can be invalid

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

Conflicts:
	lib/pelias/tasks/quattroshapes.rake