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
Merge branch 'develop'

* develop:
  added Datto logo, updated FAQ
  Removed OpenShift index page
  Fixed Gemfile merge conflicts
  Merged Openshift Rails demo app for config settings
  Moved assets to apropriate directories

Conflicts:
	.openshift/action_hooks/deploy
	Gemfile.lock
Disabled redundant deploy commands
Removed application.erb in favor of haml
removed commented line
made nav float right