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