make modifications so that tempest passes
Merge branch 'volume-type-list' into fix-tempest-errors

Conflicts:
	etc/jumpgate.conf
mark tempest tests modifications in jumpgate
add last tempest output
Merge branch 'master' into fix-tempest-errors
give tempest output a better name
add jumpgate cancel script
fix unit tests and pep8 errors
Use TODO properly, remove Tempest output
Include documentation on Tempest configuration
Merge pull request #141 from imkarrer/fix-tempest-errors

Fix tempest errors