Merge pull request #995 from jeffreythomas/dev

Mantle source.  Doing tests next.
Mantle tests formatting.