Merge branch 'iwehrman/v2' into ps-next
Fix the include-ancestor-masks config option
add config option to allow dither
Merge pull request #215 from adobe-photoshop/jrb/dither

add config option to allow dither
Merge branch 'ps-next' of https://github.com/adobe-photoshop/generator-assets into ps-next
Merge branch 'iwehrman/v2' into ps-next