Switched to using bower for package management
Merge branch 'master' of https://github.com/olane/socalloc

Conflicts:
	README.md