fixed more merge conflicts hopefully...
annndd more merge conflicts
i hate merging
had forgotten to add html page for public posts in last commites
Change SERVERONLY description

Changed to say Dogenode friends only.  Part of #63.
Removed yaml import from api/views.py

I'm not sure why it's needed at the moment so it's gone for now.
If someone needs it again please commit with all the functionality
included to give us a better context.
Ignoring media folder

In preparation for future image support.
Initial commit of image hosting support (Closed #60)

Sorry, but you might need to nuke your DBs for this one.

Dogenode now supports image hosting.  Still need to work on allowing
users to upload files, but if you manually upload images via the admin
panel, you can verify that it works.

If a user cannot view an image, not_allowed.png is shown instead.  If
a file is not found, not_found.png is shown instead.
Fix Visibility Exceptions link

Was still using author name as the endpoint, when we have changed that
to use the GUID.
Adding .img-responsive-horizontal for image display
ImagePost added to Images model

Removes many-to-many relation between posts and their associated images.
getImage URL regex redone

Wasn't supporting all cases initially, but now I'm pretty confident
it's doing what I want it to do.  Also supports junk after the ? mark
to force browsers to send a new GET request.
Adding visibility and shortening Delete button

Manage Posts needs to convey more information, so visibility was added
and the Delete button is shortened to a simple "Delete".
Posts now support images (Closed #59)

Users can upload multiple images, and have them show up in their posts.
Other users that have permission to view a post also have permission to view
the associated images any time they are logged in.  Public posts with images
allow anyone to see an image if they have the URL.

I wanted to say that #61 is done, but I'll need to implement unit tests before that's true.
Search now finds authors from other servers

The relationship stuff (friending, befriending) doesn't work yet.
modified date now changes after you put to a post
author_id field changed to guid. Also fixed bug where if viewing someone<s profile, clicking on 'my profile' would bring you back to their profile
Add remote relationships for authors (backend)

Authors can now befriend/unbefriend authors from other servers.

API tests and RESTful interface are complete for this.  Front-end
browser views are not yet completed.
Added requirements.txt

Just run 'pip install -r requirements.txt' to get the latest dependencies after each pull.
Fix search relationships

The relationship updating and displaying was extremely broken. Following
and unfollowing local and remote users works in the search page now.

Also added remote relationships to the admin page.