merge from patrick
Merge remote-tracking branch 'patrick/master'
merge again
Merge remote-tracking branch 'patrick/master'
fix image reader bug
Merge remote-tracking branch 'dean/master'
Messing around with vtkSmartPointer and vtkNew