Mac Installation: added alcatraz
Merge remote-tracking branch 'origin/master'

* origin/master:
  Added option 'nothreading' to django runserver alias