Merge pull request #18 from biomimetics/imageproc2.5-integration

Bringing in Ron's testing branch + latest Duncan's one; enjoy!