Adding ability to edit posts.
Merge branch 'master' of github.com:blainegarrett/blainegarrett into new-skin

Conflicts:
	merkabah
	plugins/blog/datatables.py