shuttle-v2: cleanup
Merge branch 'master' of github.com:Polymer/labs