Clean up the Makefile a bit

I think this should actually fix travis, by using bash rather than sh.