Merge branch 'remove-bower'