add lock file memcache
Merge branch 'housing-untangle-features' of github.com:bryanhirsch/Drupal4OK into housing-untangle-features
My riders view configuration
Fixing regression of old errors.
Fix T_String error
Merge pull request #67 from Nouveau/housing-untangle-features

Fix T_String error in template.php
Merge pull request #66 from carsonblack/housing-untangle-features

My riders view configuration
Merge remote-tracking branch 'bryanhirsch/housing' into housing