Lock results file while doing merge.
Update Changelog
Detect when being run inside parallel_tests (Issue #64)
Update Changelog
Merge remote-tracking branch 'jshraibman-mdsol/master'

Conflicts:
	CHANGELOG.md
	simplecov.gemspec