Unifying the codebase to use common functions, regardless of the dataset.  Also, using the builtin OpenCV bruteforce matcher for bag-of-words feature building.