More TODO!
Merge branch 'tomer-dev' into dev
Using the right server and user when deploying
Merge branch 'release/0.8.6' into dev
Fix stats and add a bit of caching
caching, add memcached to requirements.txt