updates from imac
Merge branch 'master' of https://github.com/GregSchultz/sonar

Conflicts:
	jsonParseString.rb
	metricsTest-coverage.json
	metricsTest-ncloc.json
	output/metricsTest-coverage.csv
	output/metricsTest-ncloc.csv
merge from imac