This is getting close, gotta clean up the docs and get some tests in before I merge it in
This still needs tests, but I want to get these changes into develop tonight
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into feature/MoreLineScan
Merge branch 'feature/MoreLineScan' into develop