bug fixes

I'll try to make sure i ddn't brak anythng else before merging with
master
Added support for .tiff and .tif
Merge pull request #200 from Align/Graham-april-2-4

Graham april 2 4