Update totoro target
Simplify code
Add specs for destroy
Rebuild packages
Merge branch 'master' into gh-pages