Basic heatmap working
first cut of heatmap
Controls to toggle heatmap/markers on and off
added search plugin

Conflicts:
	bower.json
	components/map/map.directive.js

manual conflict resolution

no need for external css

whoops
add deps
Fix merge conflicts