Update, and enable CircleCI