begin cleaning up computer vision code
Merge branches 'version2' and 'temp' into version2
Merge branches 'version3' and 'version2' into version3