Funnel fail

The funnel for nearby/watchlist is only being flagged on the photo
upload form on the uploads page.

I changed the wrong file. Doh.

Change-Id: I105a0c5935bfae33a3e462903b88359fbca33d3e
Use the correct logging function

This is currently throwing a js error and not logging clicks to
what does this mean. Eek.

Change-Id: Icf31bfba3204d4e1abf16fc0e5184a3b590e8617
Merge "Funnel fail"
Fix format check

Change-Id: Ia8fd129a604d1672641ad3e3d1e1308d5bbd2bc4