Remove specific username from Makefile
Default Makefile SSH-USER to USER
Rename SSH-USER to SSH_USER for consistency
Merge branch 'master' of github.com:haskell/cabal