Minor updates, added missing Enchanting items

Some code re-org and cleanup
Added missing Enchantment items Swirling Arcane Essence and Brimming Mana Shard
Added "/akm update" to force a macro update