Massive performance improvements
Further updates
Make sure the cache is up to date before trying to merge
Update the cache
Put comment back
Update cache before update
Merge pull request #31 from guardian/hg-noting-optimisation

Mega performance improvements