options: [-vnum] prints the same information as [-version]
Minor comment fixes
changelog: updated for minor release (1.3.1)
Merge pull request #79 from raphael-proust/master

Minor comment fixes
vim: fix for locate

When sending the "word" under the cursor to merlin, we didn't split on
operators.
state: Not enough laziness caused unloaded modules list to be computed in wrong path
Merge branch 'experimental'

Conflicts:
	src/ocamlmerlin.ml
logger: bugfix in presence of MERLIN_LOG