friends show up but are not persisted
fixed friends visabilty not being persisted but they do not show up as friends
users now show up with correct status but are missing pictures
users image now shows correctly
Merge branch 'master' into show-friends-for-password-users
implemented merging for imported contacts to allow users to have local and imported contacts
Check contact ids from old contact list
Refactor updating FB/Google contacts with user specific data
Clear contacts/friends/moods list on logout
Minor indent fix
Refactor workflow for getting contact lists
Make sure contact list is only populated once
Refresh Google OAuth token after it has expired
Upgrade router smart package
Switch to terro's branch of jade-handlebars
Upgrade to Meteor 0.6.5.1
Fixes after upgrade to 0.6.5.1

* Switch meteor.http to HTTP
* Templates now need to be at global scope