Merged Openshift Rails demo app for config settings
Resolved Gemfile.lock conflicts
Merging old hooks with new ones
Removed custom bundle dir commands
Fixed OpenShift gems & assets
Removed default OpenShift index.html
Fixed asset precompilation
Disabled example rails app deploy scripts
Re-enabled OpenShift database deployment script
Removed "force_clean_build" marker