Replaced PIL with Pillow - fixes #1158 - Need to uninstall existing PIL on deploy
changed to Pillow and set htmtmock to >= 1.0.6
Merge branch 'master' into pillow