merging tony's changes from cameo with my changes here for bower to update to proper version