Merge branch 'upstream' into develop
Add configurable tick marks

Adds control over the line width and colour of tick marks.
Respond to review comments

Fixes the docs of the new methods, and the type of the new theme properties
Merge pull request #229 from tpkelly/develop

Configurable tickmarks