Add strategy to kill misbehaving processes
Add code to ENSURE plack gets properly killed.
Merge branch 'master' into scorched_earth

Conflicts:
	toolset/benchmark/framework_test.py
Merge pull request #1133 from TechEmpower/scorched_earth

Scorched earth
Fix minor bugs
Merge pull request #1136 from TechEmpower/scorched_earth

Fix minor bugs
Drop support for skip key, it's deprecated by --include and --exclude
Minor Travis-CI patch
Complain when an attribute is not found
Cleanup parsing FrameworkTest from benchmark_config file
Turn Benchmarker.type into a list of test types

Also create a variable of the keys required for each test type
Update FrameworkTest.runTests
Ensure a minimum set of keys is present in the benchmark_config
DO NOT MERGE (Comment out until #557 is resolved)
Add initial FrameworkTestType classes
Map test type strings to FrameworkTestType objects
Remove deprecated contains_type method
Fix requires_db
Move JSON validation into specific type
Fix bug in header