UPDATE: Upgrade for latest use of CodeKit