Vagrant Dependency Issues

Update to Gitlab 6.  This update requires adjusting the example manifests to resolve issues with cyclical dependencies.  I believe that the current issue is a result of the usage of staging and have adjusted the code to remove all staging use while maintaining the same functionality.