Merge branch 'uwsgi_perf' of https://github.com/MalcolmEvershed/FrameworkBenchmarks into pr479_MalcomEvershed_uwsgi_wsgi_bottle_flask_20131003-1
Relates to pull request 479. https://github.com/TechEmpower/FrameworkBenchmarks/pull/479
Accepting PR479 for bottle, flask, uwsgi and wsgi changes from Malcom Evershed
Removed a debugging line
Merge branch 'results' into development
Clean up output: removed a lonely )
multiproc_timeout_20131002 implements a basic arbiter that monitors each test and will terminate it after a specified number of seconds elapses.

Merge branch 'multiproc_timeout_20131002' into development
 'round_seven_github_pullrequests_asb' includes github PR484, PR481, PR479
These three have been tested invidually and appear to run without issue.
Merge remote-tracking branch 'techem/master'
Fixes to makefile to compile on F19. Fixed mime type as returned by plaintext test.
Removed legacy test descriptions

Linked to test requirements section of results web site.
Resolving merge conflicts.
Tornado is fixed! Putting the indented benchmarker back in
Updated the installer.py script and benchmark_profile file with vert.x 2.0 and added variable cpu count to setup.py
Improved Vert.x test server and upgraded to 2.0.2-final
Merge branch 'master' of https://github.com/purplefox/FrameworkBenchmarks
write in end() as slight optimisation
add symfony2 stripped version
disable profiler
Added -u requirement and clarified key as private key

The `-u` command line argument is required.

The SSH key required by `-i` is the *private* key.
Merged in PR501