Add ability to split redis over multiple machines
Changes to allow codeship to work with split redis
Merge pull request #1633 from zz9pzza/update_codeship_redis

Changes to allow codeship to work with split redis
Merge branch 'redis_split' of git://github.com/elzj/otwarchive into elzj-redis_split

Conflicts:
	config/redis.travis.example
Resolve conflict
See if aliasing redis_general to redis_autocomplete works
Fix bad redis variable and missing self
Merge pull request #1635 from elzj/redis_split

Issue 3974: Fix bad redis variable and missing self
Merge remote-tracking branch 'remotes/upstream/master' into 3929-claim-emails-redux
3929 Corrected links in HTML emails and removed them from text versions. Added tests.