Modifying project to include other image modalities
Merge remote-tracking branch 'dean/master'

Conflicts:
	build/CMakeLists.txt
Major redesign (see last commit) WIP (will not compile)
Merge remote-tracking branch 'patrick/master'