local changes
merge changes
Merge branch 'master' of git://github.com/tobinder/CIS
Merge branch 'master' of git://github.com/tobinder/CIS

Conflicts:
	compute_watershed_regions.h
Add Elle dataset handling