Updates for purescript 0.6
Merge branch 'topic/purescript-0.6-updates'
Fixing merge conflicts