Fixed windows setup script for ROI Buddy.
Merge branch 'master' into 0.2.x
temporary(?) fix for motion correction issue
Refactoring and bug fixes in _correlation_based_correction.
Merge branch 'master' of 156.111.43.151:/opt/git/sima

Undid temporary fix in commit 7808000786d8f8e53b030668ba155ec72ac2d5be

Conflicts:
	sima/motion.py
Merge branch 'master' into 0.2.x