gettin there?
Merge branch 'daniel' of https://github.com/memo/VolumeRunner into memo

Conflicts:
	VolumeRunnerApp/bin/data/ofxMSAControlFreak/MSAControlFreak/default.xml