Combine into a single-file package

See discussion in https://github.com/milkypostman/melpa/pull/2146
Remove redundant "-group" from custom group name