Add groovy; remove duplicate tmate
Merge commit '9855bba86a31105fcf5de07363a119516a93b9e3'

Conflicts:
	bin/brew-install