bower init'd
fix merge?