bump.sh: Fix version formatting
Fix imports for SPEC
Merge branch 'master' into release

Conflicts:
	Language/Haskell/GhcMod/Utils.hs