vim: dump proper json for debugging
Fix .gitmodules and README.md after migration to merlin2
Update travis scripts
Dot_merlin: ignore whitespaces in .merlin
Fix #257 nonrec in 4.02
Fix #256 in 4.02 (order of sig extensions)
Fix #258 (warning in p4_quotation)