Merge pull request #840 from astaxie/patch-3

update the config for plaintext & db
Merge pull request #839 from astaxie/patch-2

add plaintext & db query test Also needed to merge PR 840 before to make this PR work.
Updates for round 10

* upgrade Spring Boot version
* upgrade Tomcat version
* Use HikariCP
flask-raw: Disalbe transaction management.

2500 -> 2700 on c3.xlarge.
flask-raw: Fix connection leak.
849 Attempted fixing Weber/Elixir
Merge branch '849'

Conflicts:
	toolset/setup/linux/installer.py
Merge branch 'flask-no-transaction' of http://github.com/methane/FrameworkBenchmarks into 890
890 passes mysql tests

This commit does not seem to break
the tests, pypy tests still need
to be resolved.
Merge branch 'boot-upgrade' of http://github.com/bclozel/FrameworkBenchmarks into 889
Merge branch 'master' of https://github.com/stuartwdouglas/FrameworkBenchmarks into 845
Merge pull request #845 from stuartwdouglas/master

Update to latest version and increase backlog
Merge branch 'undertow' of https://github.com/ctomc/FrameworkBenchmarks into 865

Conflicts:
	undertow/pom.xml
Merge branch '865'
Merge branch 'master' of https://github.com/xaxaxa/FrameworkBenchmarks into 778
falcon-pypy: Fix installing falcon.
Fix results.json only contains result of last test.
778 had to add %><% before and after if statments
Merge branch '778'
Fix old Python syntax.