updated the wording for housing header/footer
renamed housing path and machine names in housing views
updated the package name for dr_auto_node_titles
this is to fix #75, hide preview on ride requests
updated privacy wording for housing to use correct dns name per #110
added conditional fields module (can't featurize its settings) and fixed the views export for housing
marking name & contact preference as required and re-ordered the field weights for ride request
removed name as a required field
Resolving merge conflict.

	modified:   docroot/sites/default/settings.php
added rules to require auth for more paths and fixed the rider view
Revert "Changes from 7.x-1.5 to 7.x-1.6."

This reverts commit b2dab1fbb72e48cbead736939b0b7cf63cabb666.
Revert settings.php change accidentally committed for 7.x-1.6.

	modified:   docroot/sites/default/settings.php
Remove all local dev stuff from settings.php.

	modified:   settings.php
Moved settings.php stuff into sites/help4ok.org.

Removed sites/default/settings.php.

This should resolve conflicts with people's local dev settings.

	new file:   help4ok.org/default.settings.php
 	renamed:    default/settings.php -> help4ok.org/settings.php
Merge branch '7.x-1.x' of github.com:bryanhirsch/Drupal4OK into thursAfternoonHeddn
added deploy instructions