[KFSQA-784] Added parallel_tests gem. Seems to work well, mostly sorting out how we can use it most efficiently.
[KFSQA-784] Added the JSON merge script to the resources directory. Updated the test-factory and watir-webdriver gems to the most recent versions.
[KFSQA-784] Fixed the profiles a bit.
[KFSQA-784] Fixed the profiles a bit.
Merge remote-tracking branch 'origin/KFSQA-784' into KFSQA-750

Conflicts:
	Gemfile
[KFSQA-750] Stuff.