Add --cursor-color option
Merge branch 'feature-cursor-color-option' into develop
Add tabstop option
Merge branch 'feature-tabstop-option' into develop
Drop conf.h
Bump minor version
Merge branch 'develop'