Made master test script and changes enabling it
Merge branch 'master' of github.com:cdiss/POP_REU_2014
Adapted Makefile for -b and made prettier