Fixes template.json in documentation to be a valid JSON
Upgrades windshaft and cartodb-redis
Adds poolSize configuration for mapnik
Run check before any assert so server is stopped
Merge branch 'master' into mapnik-2.3.x
Starts using mapnik 2.3.x via windshaft upgrade