Merge pull request #581 from kevmoo/polymer

Locking down, cleaning up...