Merge pull request #36 from darcyclarke/develop

Added stylus example and support and updated readme
Fixed merge conflict
Fixed up default template to correct state markup examples
Merge...