Clean up Makefile.
Test
Test
Merge github.com:smskelley/canny-opencl

Merging
Revert "Merge github.com:smskelley/canny-opencl"

This reverts commit 6bb4eedde67e4a484fafff8bab446dbc2f8d3485, reversing
changes made to 83dd8a8f3361cd1a7a6310906ab2dd181b039b5d.
Revert "Test"

This reverts commit 83dd8a8f3361cd1a7a6310906ab2dd181b039b5d.
Revert "Test"

This reverts commit e343324c79491920f66668bf22664f0bddad51b2.