Following Django standard pretty urls format
Merge branch 'master' of https://github.com/dulrich15/lil-wiki