pocp.py now uses json mapping files for mapping, rather than using th
data warehouse
Merge branch 'master' of
https://github.com/ElectricityAuthority/pocp.git

Conflicts:
	metadata.json
	pocp_all.csv
	pocp_data_year.json
	pocp_transmission_data_year.json