travis: use install-deps instead of installing deps manually. I think I did this before..?
Merge branch 'master' into travis
Merge branch 'travis2' into travis