Convert more tests
Convert test_imagecolor.py
Convert more tests
Delete test test [CI skip]
Skip test_floodfill_border() on PyPy

Otherwise it sometimes, but not always, causes an error:

RPython traceback:
  File "rpython_jit_metainterp_compile.c", line 20472, in send_loop_to_backend
  File "rpython_jit_backend_x86_assembler.c", line 1818, in Assembler386_assemble_loop
  File "rpython_jit_backend_x86_regalloc.c", line 293, in RegAlloc_prepare_loop
  File "rpython_jit_backend_x86_regalloc.c", line 909, in RegAlloc__prepare
  File "rpython_jit_backend_llsupport_regalloc.c", line 4706, in compute_vars_longevity
Fatal RPython error: AssertionError
/home/travis/build.sh: line 236:  7300 Aborted
Skip test_floodfill_border() on PyPy to avoid fatal error
Comment out lena() caching
Comment out lena() caching
Return duplicate in lena()
Fix syntax error
Disable lena() caching for now, convert more tests
Fix test/test_imagefileio.py
Convert more tests
Convert more tests, fix test_imagewin.py
Convert more tests
Fix a its/it's incorrect usage
Merge pull request #696 from Smashman/patch-1

Fix a its/it's incorrect usage
assert_warning() checks in case of multiple warnings
Merge pull request #694 from hugovk/floodfill

Skip test_floodfill_border() on PyPy to avoid fatal error
Merge remote-tracking branch 'upstream/master' into unittest1merge

Conflicts:
	Tests/test_imagedraw.py