Merge pull request #33 from rackerjoe/master

neutron fixes
Fix bug when multiple quota names include 'volume'
Merge pull request #34 from hughsaunders/fix_cinder_quota_update

Fix bug when multiple quota names include 'volume'
test image should not need to be suffixed with "-image"
add some cinder teardown actions to remove old cruft after failed tests
test image should not need to be suffixed with "-image"
prefer neutron over quantum