minor: update polymer build script
minor: vagrant: rm ./usr/
Merge remote-tracking branch 'upstream/master'