RR: readded settings.py file.

Change-Id: Ib6d5bfd715b54b8548f8b288fa0717502b6773be
RR: adjusted gitignore to include settings.py file.

Change-Id: I0bf935b8ca95b017d564ac6f6d9f4a80972601ce
RR: improvements to reduce risk of commiting passwords to the repository.

Change-Id: Ic3c4c0e07c19c2d8b007b9ad43a07c1cfdc14d0f
RR: added comment to settings.py.

Change-Id: Iae71f628ec3daefb81c7e0da2e247dd7f33d331c
Merge branch 'master' of https://github.com/rrothwell/langstroth

Conflicts:
	langstroth/settings.py

Change-Id: I591f91980924178d68f64b3ad2b262ef3f054888