Add help sidebar for macros and make allowed methods configurable
Merge branch 'master' of github.com:benjaoming/django-wiki