Add short_code and standard_rate to PhoneMetadata
Generated Python files for new metadata format
Merge code changes from upstream r594
PEP8 warning fixes
Register short metadata with PhoneMetadata
Merge upstream short number code changes from r594
Regenerated top-level metadata Python files
Sort out exports
fix spacing typo
Add generated Python files for short number metadata
Restore 100% test coverage
Merge branch 'dev' into python3

Conflicts:
	python/phonenumbers/phonemetadata.py
	python/phonenumbers/phonenumbermatcher.py
	python/phonenumbers/phonenumberutil.py
	python/tests/examplenumberstest.py
	python/tests/phonenumbermatchertest.py
	python/tests/phonenumberutiltest.py
	python/tests/shortnumberutiltest.py
	tools/python/makefile