Merge pull request #3 from jkaha001/dev

editphoto
utils
w
rm swp
cleaned excess moved to utils
s3 threaded in views
settings utils added
users views render all editphoto
url editphoto redirect
rm profilepage.html
users/views import imageform
editprofile.html
avatar display fixed
add swp
following numbered on following page
Merge remote-tracking branch 'upstream/dev'
added friends module which consists of Friendship and FriendsRequest classes inside the models.py file and also added some functions called add_friend which will actually symetrically add two users as friends.  There is also friends_page which will inject values into a given friends.html page (which hasnt been specified yet)
friends settings/urls
friends/users