Add opam 1.1.1
Merge pull request #1810 from orbitz/update-to-opam-1.1.1

Add opam 1.1.1