Unit tests for Volume attach & detach + bug fixes
Add support for <cinder type-list> and <cinder create --volume-type>
Merge remote-tracking branch 'origin/volume-type-list' into explore-conflict

Conflicts:
	tests/jumpgate-tests/volume/test_volumes.py
resolve Travis pypy build issue
Merge branch 'master' into volume-type-list
Merge pull request #136 from schivuk/testVolumes

Unit tests for Volume attach & detach + bug fixes
Added load flavors from config file + extra specs

Change-Id: I951c6be5ed8604a958b4f4413ceac6415f1520fd
Work around for hard coded flavor
Merge pull request #138 from AndrewFly/server_hard_coded_flavors

Work around for hard coded flavor.
Merge branch 'master' into volume-type-list
remove class level stuff
Merge branch 'master' into totalW

Conflicts:
	jumpgate/compute/drivers/sl/servers.py
	tests/jumpgate-tests/compute/test_servers.py
remove two incorrect lines for json reading
Merge branch 'master' into totalW

Conflicts:
	jumpgate/compute/drivers/sl/servers.py
Merge pull request #130 from imkarrer/volume-type-list

Add support for <cinder type-list> and <cinder create --volume-type>
Resolved the MagicMock issue
Merge branch 'master' into totalW

Conflicts:
	tests/jumpgate-tests/common/test_dispatchers.py
	tests/jumpgate-tests/test.jumpgate.conf
Merge pull request #131 from schivuk/totalW

Added show extra_specs for flavors, code for default flavor to load from...