Fixed issue #280: Display now obeys the default format.
Added a test case for the above.
Merge branch 'ImageDisplayDefaultFormat' of https://github.com/goddardl/gaffer into goddardl-ImageDisplayDefaultFormat

Conflicts:
	python/GafferImageTest/__init__.py