cpoll_cppsp: single query: do not output "[" and "]"
Merge branch 'master' of https://github.com/xaxaxa/FrameworkBenchmarks into 778
778 had to add %><% before and after if statments
Merge branch '778'
Revert "Revert "Merge branch 'tornado-postgres' of https://github.com/maticz/FrameworkBenchmarks into 671""

This reverts commit 99dcab20cb6d1be17eb40d3e5cb55344f2e6cc45.

Conflicts:
	toolset/setup/linux/installer.py
	tornado/server.py
Merge branch 'revert-pypy-gunicorn' of http://github.com/methane/FrameworkBenchmarks into 896
896 removed tornado option

Running the pypy test for flask with
the tornado option causes it to fail.
Merge branch '896'
Merge branch 'falcon-pypy' of http://github.com/methane/FrameworkBenchmarks into 892
Disable meinheld accesslog with post_fork().
bottle: Fix benchmark_config
Merge branch 'master' into devel
Merge branch 'bottle-remove-accesslog' into devel