Merge pull request #303 from ndmitchell/master

Add some new packages by Neil
Add ghcid