Upgrade Vert.x to 2.1M5
Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks
Upgrade Vert.x to 2.1RC3
Merge https://github.com/purplefox/FrameworkBenchmarks into 820
Merge branch '820' fixed merge conflict

Conflict was in config/benchamrk_profile

Conflicts:
	config/benchmark_profile