Your Name: Matt

Subject Line: Major moves to Markers, controllers

What Happened:

Crag Controller now pushes link data to each marker, user avatar to user marker
User Controller responds properly to json and html requests