Removed spurious includes that were difficult to maintain. Added support for automatic grayscale conversion to keypoint and descriptor extractors.

Change-Id: Ied9073e3f8feb17a36539acb06eb5f8852f0fdda