Fixed some lingering merge issues, plus fixed the profile picture discrepency by always looking for it in the location where it is for first class users. Made user object creation from 'participants' message look like normal login.
Merge pull request #115 from drewww/permalink-profile-fix

Fixed some lingering merge issues, plus fixed the profile picture discre...