Test updates pre Rails32 Cont
Merge pull request #1245 from scottsds/continued_test_updates

Continued test updates
Make it easier to set the staging and production urls for elasticsearch
Merge pull request #1248 from elzj/elasticsearch_config

Make it easier to set the staging and production urls for elasticsearch
Adding resque restart back to the deploy script
Issue 3657: fixing bug in redirects controller, where www was added to all urls
Merge pull request #1249 from elzj/issue_3657_broken_redirects

Issue 3657: fixing bug in redirects controller