Travis: wait for testserver, show logs on failure, improve Makefile
Merge branch 'master' into travis-setup