made settings.py import settings from a local_settings.py if it exists
Merge branch 'master' of github.com:martflu/amanaman

* 'master' of github.com:martflu/amanaman:
  CHALLENGE: small adjustments
  increase polling_interval on ajax error
  cleanup
  bit of cleanup
  stack only blocked with nothing review
  introduced multi_comment for multiple comments per page. should work dynamically but slow.