fixed bug in visual vocabulary, cleaned up classifier