Bower rework - fixing master bower issues!