Comment clean up & Elsewhere link override
Merge grunt conflicts