border method in image.py 1st argument changes to self.
Merge branch 'master' of github.com:turky/wand into 0.3-maintenance