Merge pull request #1 from petecorreia/master

Initial scaffolding for sass / js
Make feeds public
Merge pull request #2 from levent/private_false

Make feeds public
Add newrelic_rpm
Merge pull request #3 from levent/newrelic

Add newrelic_rpm
Merge pull request #4 from petecorreia/master

Initial homepage styles
Add ga.js
Merge pull request #5 from levent/master

Add google analytics
Show map markers
Merge pull request #6 from levent/map

Show home page map markers
Handle feed find errors
Merge pull request #7 from levent/map

Handle feed find errors
Collect map markers
Claiming error message styles
Analytics code now at the end of body and async
Location picker working except find me
More work on Edit page
Merge branch 'master' into bro_map

Conflicts:
	views/home.erb
Map working again on homepage
Edit form is powered by ADRENALIN!