Fixes

Added 'diff' as dependency to package so all properly installs.

Also fixed reference to `colors.underline` to say `styles.underline`.

**Note:** only merge everything after 'merged with danielmoore origin'.
Not sure why the other commits are showing up here.