Updates based on testing with a fresh install
Merge branch 'master' of https://github.com/BrianBrophy/OpenStack-Installation