Merge branch 'master' of github.com:dellsystem/wikinotes
Update get_absolute_url on User to use reverse

Looks like the last thing that was using @models.permalink
Reorder model methods to adhere to conventions

See https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/