Fixed bad merge between Vehicles/Placenames changes
Merge branch 'master' of https://github.com/eegeo/environment-themes