Merge pull request #41 from ilanasufrin/ben_branch

Ben branch
prevents all friends from being re-created upon each login
Merge pull request #42 from ilanasufrin/emily

prevents all friends from being re-created upon each login
removes friends pg limit, updates some deprecated methods, fixes profile pix
fixes line spacing merge conflict in user model
comments out nonexistant geocoded method on user in user controller
Merge pull request #43 from ilanasufrin/emily

Emily
gets geocoder working for user
Merge pull request #44 from ilanasufrin/emily

gets geocoder working for user
removes manual ip set, uncomments dynamic setting
Merge pull request #45 from ilanasufrin/emily

removes manual ip set, uncomments dynamic setting
Adds subscriptions table, trying a few things in sessions controller for geocoder