simplified bower urls (removed github.com from package names)

Conflicts:
	bower.json