Merge in @hhsnopek's package/component/bower files