Tweaks required by the latest optparse-applicative
factored 'Bodies' out of 'Binding' so it can be used in Class/Instance declarations
Fix license headers, cabal prop to say BSD2.
Merge latest master.