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
Issue 3660: Link in ToS must go to DoS
Issue 3453: ToS/FaQ updates. [skip ci]
Changes for issue 3659 ( the simple stuff )
And the mistakes I saw when I looked.
Fix English
Add the headers and the footers etc
Moving memcached url to yaml files
Loading memcached url directly from yml
Merge pull request #1254 from zz9pzza/issue_3545

Issue 3545
Merge pull request #1251 from scottsds/issue_3660

Issue 3660: Link in ToS must go to DoS
Merge pull request #1252 from scottsds/issue_3453_ToS_changes

Issue 3453: ToS/FaQ updates. [skip ci]
Merge branch 'master' into deploy
Merging master, resolving Gemfile.lock conflict
Removing outdated debug_rjs line from config
Updating cucumber rails
Fixes for failing specs
Updating syntax of fixture steps