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