Initial steps in codebase cleanup
instance_payload_id is the primary key, name and flavor are irrelevant
Merge branch 'use-instance-type-ids' of github.com:anchor/ceilometer-publisher-vaultaire into siphash

Conflicts:
	ceilometer_publisher_vaultaire/process.py
Merge branch 'cleanup' of github.com:anchor/ceilometer-publisher-vaultaire into siphash

Conflicts:
	ceilometer_publisher_vaultaire/__init__.py
	ceilometer_publisher_vaultaire/process.py