massive cleanup to remove nexus/pods and many things that depended on them
add back in the /profile merging logic that was buried in friends
missed another dep'd test
adding /id back
Merge branch 'master' of github.com:Singly/hallway into depod
merge conflict fix
Merge pull request #881 from Singly/depod

massive cleanup to remove nexus/pods and many things that depended on them