Reenable parallel builds on non-cutter machines
Merge branch 'concurrent_cilk' of github.com:iu-parfunc/concurrent_cilk into concurrent_cilk

Conflicts:
	cilk_tests