Merge pull request #5 from dladowitz/master

Updated Google map and icon
Set up faye pubsub and angular

Conflicts:
	Gemfile.lock
Setup pusher and create angular factory for subscribing to events

Conflicts:
	app/models/geolocation.rb
Setup angular and pusher

Conflicts:
	Gemfile.lock
	config/routes.rb
	public/index.html
	public/javascripts/application.js
Merge pull request #6 from tomdepplito/pusher-angular2

Pusher angular2
agularized some shit
Make maps work with angular MapCtrl