add parallel test exec capability
Merge branch 'master' into parallel-execution

Conflicts:
	Gemfile
Merge branch 'parallel-execution'