Removes subscriptions table, adds stalking column to friendships, adds stalking conditional to friends show page
removes subscriptions and gets geocoder working again
Merge pull request #46 from ilanasufrin/emily

Emily
Merges conflict in friend model