Updated UserFriendship model
Updated user to have userfriendships
Updated to ignore bin directory