Remove settings from tracked files
	deleted:    kenya/kenya/settings.py
Merge branch 'master' of https://github.com/pittsw/Encouragement

Conflicts:
	kenya/kenya/settings.py

Merging in commit from github
	new file:   kenya/kenya.db
	modified:   kenya/kenya/urls.py
	modified:   kenya/patients/admin.py
	modified:   kenya/patients/fixtures/create_clients.py
	new file:   kenya/patients/fixtures/large_data.json
	deleted:    kenya/patients/fixtures/populate_database.json
	new file:   kenya/patients/fixtures/pre.txt
	deleted:    kenya/patients/fixtures/real_data.json
	new file:   kenya/patients/fixtures/small_data.json
	deleted:    kenya/patients/fixtures/test_register.json
	deleted:    kenya/patients/fixtures/test_train.json
	deleted:    kenya/patients/fixtures/test_update.json
	modified:   kenya/patients/forms.py
	modified:   kenya/patients/models.py
	modified:   kenya/patients/static/css/encouragement.css
	modified:   kenya/patients/static/css/grid.css
	modified:   kenya/patients/tasks.py
	modified:   kenya/patients/templates/add_client.html
	modified:   kenya/patients/templates/index.html
	modified:   kenya/patients/views.py
	modified:   kenya/shujaa/__init__.py
	modified:   kenya/shujaa/models.py
	modified:   kenya/shujaa/urls.py
	modified:   kenya/shujaa/views.py
Style changes