Upgrade to Emmet for CM 3.1

Needs the tab key removed from keyMap, will look into why this is