Updated .gitignore so that node_modules and bower_components aren't versioned
merged