Add "main" to bower.json

Closes #1598
Merge remote-tracking branch 'ericf/bower-main' into dev-master