Updated for npm and bower