Sunday evening work
Merge branch 'bbsimapi' of https://github.com/claytronics/meld into bbsimapi

Commiting as necessary