v0.3.2
Chrome Canary chokes on template cruft, remove it.
Resolve merge issues
Merge