remove extension, fixes #534

R=sigmund@google.com

Review URL: https://chromiumcodereview.appspot.com//17096007
Merge remote-tracking branch 'origin/master' into polymer