Merge pull request #29 from jvish/review

Added animation tests to the table of contents.
replace last fix for bug when text in sketch had no number in it.

The text in that case was showing up twice.
Merge pull request #30 from mlippert/widget-refactor

replace last fix for bug when text in sketch had no number in it.
Merge branch 'upstream/master'