Merge pull request #5 from hugovk/unittest1merge

More tests and merge with upstream
Merge pull request #693 from hugovk/unittest0

Start using unittest for tests
Update
Merge remote-tracking branch 'upstream/master' into unittest2
Convert test/test_imageqt.py