Fixes tests, removes junk from Makefile, upgrade grunt-saucelabs