Merge pull request #998 from samoht/master

Fix #997
Fix pretty-printing of OPAM files

Continue #998