Merge pull request #207 from xiamx/master

Fix section edit not working
Fix navbar link to history in pages/commit.html
Use login_required decorator for page edit/create
Remove format method from PageType class

PRETTY SURE this is actually not being used at all

plus the code is horrific so, win-win
Update some titles for page-related views
Use show_object_detail decorator on page edit view
Add password for user in test fixtures

The password is user
Change merge conflict error message and markers

Now <<<<<< for more git-like merging
Create wrapper class for gitpython Commit objects

Makes it much easier to deal with commits, particularly in views.

This also gets rid of some unused features in the page history table and
removes some unneeded code (like the call to page_type_obj.format() in
the commit view; seriously what was that?????????????).
Add tests for views/{main.py,pages.py} (NEW REQT)

New requirement: mock (available through pip)

This commit extends the view-testing functionality, making it possible
to login prior to testing and create mock objects, among others. See
the diff for details.
Merge branch 'master' of github.com:dellsystem/wikinotes
Use @show_object_detail for viewing blog posts
Fix title when viewing priate messages
Fix ordering of private messages

It looks wrong on the dev site but it's fine in production ... idk

Anyway, this makes the tests pass (which I'll commit ASAP)
Improve status code check in _ViewTest

Now checks for the 302 response for tests that require login_first, and
assumes that the expected response code is 200 afterwards/otherwise.
Add tests for private-message-related views
Add tests for blog-post-related views
Add default ordering to BlogPost model
Check for correct blog post order in NewsIndexTest
Add check_context method to NewsItemTest