prepare for vm side debugging
Merge branch 'temp' of github.com:claytronics/meld into temp