Attempt to cleanup some memory when creating marks from locations
Merge branch 'master' of https://github.com/vanubi/vanubi
Match COMMIT_MSG and MERGE_MSG