Everyone's cumulative changes (rebased)

If you take a look at the [network graph](https://github.com/begriffs/vim-haskellConceal/network) for your project you'll see that people have done lots of work they haven't sent you yet. I have collected it here and rebased it so it all works together.

This includes the changes from pull request #5.