Some prep for Browse stuff.
Merge branch 'master' of https://github.com/gilchenzion/hack-ny-fall2013
Fixed the edit functionality
Merge branch 'master' of https://github.com/gilchenzion/hack-ny-fall2013