Merge branch 'develop'
removed --preserve=all (Mac incompatible), removed liftIO import
layout
can now run with clafer-0.3.3