add merge to ImageOptions
add merge_method to config
enable composite image merging
always use global image options
check for alpha_composite support
disable alpha composite test when Image.alpha_composite is not available
raise nose.plugins.skip.SkipTest when Image.alpha_composite is not available
depend on Pillow if present, otherwise on PIL
Merge branch 'camptocamp-merge-composite'