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 branch 'master' into volume-type-list
remove class level stuff
remove two incorrect lines for json reading
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