Took out ORB feature detection for now.  Implemented automated tuning for SURF features.