updated incorrect coments
Merge branch 'master' of github.com:IdeaHaven/influence
Merge branch 'master' of github.com:IdeaHaven/influence
issue #24 WIP: changed from custom directive to default one
passed vars to AppScope from map selections (zip, position, state, district)
set default zip to null
added json to livereload
fixed error where & caused favicon api to crash
currency filter added for total_amount
Merge branch 'master' of github.com:IdeaHaven/influence

Conflicts:
	app/scripts/directives/d3Donut.coffee
Merge branch 'master' of github.com:IdeaHaven/influence
Merge branch 'master' of github.com:IdeaHaven/influence
removed share this based on errors, added issue #32
changed default rep to speaker of the house
added individual funding data to compare view
Merge branch 'master' of github.com:IdeaHaven/influence
Merge branch 'master' of github.com:IdeaHaven/influence into urls

Conflicts:
	app/scripts/directives/d3Donut.coffee
Merge branch 'urls'

Conflicts:
	app/scripts/directives/d3Donut.coffee