vim: dump proper json for debugging
Fix .gitmodules and README.md after migration to merlin2
Update travis scripts