Removed cpu_number from identifier, added identifier fix to consolidated
Removed cpu_number from identifier, added identifier fix to consolidated, added payload generation for volumes and ip_allocs
Fix formatting
That line isn't necessary anymore
Bump version
Many language-oriented bugs fixed, tests updated.
Merge branch 'fix-instances' of github.com:anchor/ceilometer-publisher-vaultaire into fix-instances

Conflicts:
	ceilometer_publisher_vaultaire/process.py
Fixed .travis file
Consolidated processing for both events and pollsters
Bump version
Merge branch 'fix-instances'

Conflicts:
	setup.py