append section about how to fix django-haystack in-compatible issue with django-nonrel on OS X
Merge branch 'master' of github.com:shuge/man