Merge branch 'develop' of http://github.com/ambitioninc/django-user-guide
Merge pull request #22 from ambitioninc/master

Sync develop and master
Merge branch 'develop' of http://github.com/ambitioninc/django-user-guide
Added human-readable name to guide field
Added test for the new guide_name method
Learning to write tests
Writing tests pt 2
Code coverage now at 100%
Removed extra line
Merge pull request #24 from travistruett/master

Convenience function to humanize admin.
Merge pull request #25 from ambitioninc/develop

Develop