Made recording past 25 seconds actually work.  In other words, the timer doesn't count down at a rate of ~2.5 seconds as opposed to the 1 second it should be.
changed test data upload to be an array of points instead of (-1,-1)
current integration changes
fixed merge?
brigit_dev readme test
fixed bracket typo
adding OpenCV libs for PendulumTracker
Merge pull request #713 from beejisbrigit/master

Pulling in opencv stuff.
Manifest change
Got pendulum tracker on the rSENSE API.  Currently uploads test data with the sor account