Added starting implementation of ekmetts hask
Added constraint category
Used monadplus and made parser more general
:Merge branch 'master' into MonadPlus