Bring up to date, remove coffee, convert to gyp