updates
Merge branch 'master' of https://github.com/cirquit/Haskell
cleaned up