add wait for visible
move vms under infra

Fixes #126
Merge pull request #133 from dajohnso/vms_reorg

move vms under infra
Merge pull request #136 from aweiteka/ldap_config

add wait for visible
Fixed spacing issues
Added tests for catalog and refactored code for servicecatalogs using fixtures
Spacing issues
spacing issues
Fixed Indentattion issues
indentations fixed