Merge pull request #1 from Wikia/deploy

Deploy
Merge branch 'deploy'
Use parsoidCacheProxy
Merge branch 'master' into deploy