Fix pretty-printing of OPAM files

Continue #998
Merge pull request #999 from samoht/master

Fix pretty-printing of OPAM files