Allow dimension keys to be mapped to new keys
Merge branch 'master' into allow-mapping-of-dimension-names

Conflicts:
	backdrop/collector/ga.py
	tests/backdrop/collector/test_ga.py