Updating bower and git ignore

Conflicts:
	bower.json
Updating bower and git ignore