Moving some commands to Makefile (easier to run out of Travis-CI)