Fixes
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios

Conflicts:
	bin/runner.py
	osmef/runner.py
	scenarios/host_to_host.py
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios
Merge branch 'scenarios' of https://github.com/bigfootproject/OSMEF into scenarios