Add support for json output
Merge branch 'master' of https://github.com/smowton/scan

Conflicts:
	sim/driver.py