Merge pull request #189 from avsm/master

release 1.0.4
Merge pull request #190 from avsm/master

combinator merge and bump to 1.1.0
Restore 4.00.1 compatibility at the price of less succinct code

It was previously not working due to the use of record disambiguation
in the records.  This patch disambiguates everything such that it
remains compiling under 4.00.1.

(thanks to Jeremy Yallop for pointing out the source of the bug)
Add Travis back for 4.00.1
Sync CHANGES to reflect that 4.00.1 survives for another day
Merge branch 'master' of github.com:mirage/mirage