make service discovery consume the version key
Merge branch 'master' into feature/service_disco_consume_version

Conflicts:
	lib/fog/openstackcommon/service_discovery.rb
fix after merge
oops
Merge pull request #20 from fog/feature/service_disco_consume_version

make service discovery consume the version key