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

Changes from apullin are now cleanly merged and checked