-Added a whole crap load of comments
Merge branch 'origin/master'

Conflicts:
	pyum/settings.py