add discovery options for the version of openstack we are running against as well as setting the type of networking
fix tests for both neutron and quantum
fix a typo
fix a typo
add a comment
Merge pull request #126 from rackerjoe/master

enable testing of non-master branches