changed bower main array to use built files
Merge remote-tracking branch 'upstream/master'