update .merlin

+ conduit
+ sexplib, fieldslib
- async_ssl
Merge pull request #120 from rgrinberg/merlin_cleanup

update .merlin
fix name typos
prefer pattern match over exceptions
small style changes

prefer >>| to >>= and return
Merge pull request #122 from rgrinberg/master

style changes + typo
Fix missing deps
Update CHANGES
Bump version number to 0.11.2
Merge pull request #123 from samoht/master

Fix missing build dep
thanks @dinosaure

Remove *.syntax in META file

Conflicts:
	_oasis
	cohttp/META
	setup.ml
Merge pull request #127 from rgrinberg/master

remove syntax dependencies from META
Merge branch 'master' of github.com:mirage/ocaml-cohttp
Sync CHANGES, bump working version