Merge pull request #1136 from mirage/master

travis: updates to try using opam-1.0, opam-1.1 and ocaml 3.12.1
travis: fix with opam 1.0 installability test