Merge branch 'clone-master' adds fix for parallel_build

Conflicts:
	CHANGELOG.md
	simplecov.gemspec