Fixes for GHC 7.6
Merge commit 'a55b1af' for GHC 7.6.1 support

Conflicts:
	HSH.cabal
	HSH/Command.hs
	HSH/ShellEquivs.hs

Fixes #8