changes to how loading and saving works
- no more saving points - loading now puts the Calibration in the same state as if calibrate had just been called
Merge remote-tracking branch 'upstream/master'

Conflicts:
	libs/ofxCv/src/Calibration.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	libs/ofxCv/src/Calibration.cpp
Flow class, addresses issue #11
removed copyright, fixed gaussian constant typo, removed stray comments
fixed constant typo
windows changes
Merge branch 'master' of github.com:obviousjim/ofxCv

Conflicts:
	libs/ofxCv/src/Calibration.cpp
Merge branch 'master' of https://github.com/kylemcdonald/ofxCv

Conflicts:
	example-flow/FlowExample.xcodeproj/project.pbxproj
	example-flow/src/testApp.h
	libs/ofxCv/include/ofxCv/Flow.h
	libs/ofxCv/include/ofxCv/RunningBackground.h
	libs/ofxCv/src/Calibration.cpp
	libs/ofxCv/src/Flow.cpp
Merge branch 'master' of github.com:obviousjim/ofxCv
key points fix local
added reset method to calibration
Merge branch 'master' of github.com:obviousjim/ofxCv

Conflicts:
	example-flow-keypoints/src/testApp.cpp
ready after loading
Merge remote-tracking branch 'origin/feature-reset-calibration'
Merge branch 'master' of https://github.com/kylemcdonald/ofxCv

Conflicts:
	libs/ofxCv/src/Calibration.cpp
FlowFarneback pyramidScale must be < 1

Since it causes a crash, it might be worth it to set it to 0.99 if it's >= 1.

courtesy: 1 character pull request guy
Merge pull request #106 from jefftimesten/patch-1

FlowFarneback pyramidScale must be < 1
added reset to Calibration
Merge pull request #109 from obviousjim/reset-calibration

added reset to Calibration