key points compatible with cv 2.3
Merge pull request #70 from obviousjim/master-flow-keypoints-fix

key points compatible with cv 2.3
setter for intrinsics
fixed whitespace
Merge pull request #71 from obviousjim/master-flow-intrinsics-setter

Master flow intrinsics setter
variable naming for setIntrinsics
Merge pull request #72 from obviousjim/master-flow-intrinsics-setter

variable naming for setIntrinsics
removed osx-specific line. closes #74.
Merge branch 'master' of github.com:kylemcdonald/ofxCv
added some missing project files
Merge branch 'master' of github.com:obviousjim/ofxCv

Conflicts:
	example-flow-keypoints/src/testApp.cpp