Some documentation / spacing fixes additions.
Merge branch 'master' into cleanup

Conflicts:
	controllers/author_controller.py
Merge pull request #15 from rolsen/cleanup

Some documentation / spacing fixes additions.