Fixed a bug in Image.merge and a typo

Changed 'and' to 'or' and 'is not' to 'isnt'
Merge pull request #35 from pianiel/master

An error would not be thrown in case of bad dimensions in Image.merge. Thanks!