Minor fix
Update .travis.yml
Merge branch 'master' into travis
Merge branch 'master' into release
Merge branch 'master' into sandbox

Conflicts:
	src/output.c
Make faster monochrome dithering
Don't create cache table when it is not needed
Merge branch 'master' into release
Bump version
Merge branch 'develop' into release-1.0
Merge branch 'feature-fast-mono-dither' into release-1.0
Merge branch 'release-1.0'
Merge branch 'master' into stb_image
Update stb_image.h version to 1.44
Add an applied patch file for original stb_image.h
Merge branch 'master' into sandbox
Merge branch 'stb_image' into sandbox
Merge branch 'completion' into feature-zsh-completion
Update zsh completion file
Merge branch 'feature-bash-completion' into develop