Sync branches
Merge https://github.com/timbarnes/QandAWeb into live

Conflicts:
	dj/settings.py
	educate/views.py
	educate/views.pyc
Settings and yamjam fixes
Merge branch 'live' of https://github.com/timbarnes/QandAWeb into live
Fix database conflice
Conflicts:
	db.sqlite3