Change over to a fully metric system of units
Merge branch 'refs/heads/gh-pages' into metrification

Conflicts:
	economy.md
Merge pull request #84 from openpolitics/metrification

Change over to a fully metric system of units