Small bits of misc cleanup
Change Cursor to Stroke hotkey to Shift+S.

Patch by @caroparo.

Close #97
More cleanup
Fix typo introduced in 11fba2
Merge branch 'cleanup' into release/1.2.2

Conflicts:
	__init__.py
Merge branch 'release/1.2.2' into dev