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

Conflicts:
	CHANGELOG.md
	simplecov.gemspec