Merge pull request #1683 from edsondota/master

Add local_settings to Django's ignore