vim modeline
json: strip named lines before jsonfying
json: change equals to merge both branches

Previously we were just picking one side over the other.
Now, we at least try to pick up missing features from the
other side.