Merge branch 'beta' into prod
Merge branch 'beta' into prod
Merge branch 'beta' into prod
Correct mem_limit
Moving sphinx onto its own box.
Redis yml before sphinx.
Reconfigured sphinx.
Merged config with prod.