Merge branches 'emily_refactoring' and 'master' into emily_refactoring
made calib_pics folder (instead of keeyping img_0-9 in OT/ ; cleaned up some OT scripts
removed EyeHelperMOT (since mobdev work is happening in the eye-helper repo)
removed javaArchitecture.mdown since it was a pre-mobdev brainstorming document and no longer up to date
updated README.md
updated with plan for using the comprobo raspberry pi setup for concept testing
live_meanshift.py : adding code to make this work with ROS + raspberry pi + camera module setup (thanks Paul!)
got rid of a waitKey(0) in object_match.py that was preventing continuous udates with the object tracking live demo
Merge pull request #2 from greenteawarrior/emily_refactoring

Some quick refactoring