Updating gosquared, hopefully fixing travis
Re-arranging min tests
Updating makefile to add phantom variables