issue #45: implemented including local settings if file emergent/local_settings.py exists
issue #45: PEP8. Removed trailing whitespace from the settings file.
Merge pull request #46 from trilliput/master

issue #45: implemented including local settings
Merge remote-tracking branch 'upstream/master' into issue-33-github-login

Conflicts:
	emergent/settings.py