Travis tweaks:
 - Move make cmd to install stage
 - Move test-run to script stage