Engine Yard deployments
Merge branch 'master' into authlogic