Optical flow merger

Merge in Andrew's Optical Flow code with the rest of the code.