First pass at Makefile
Merge branch 'groupload' into groupload-perf