Minor fixes here and there
Merge branch 'master' of https://github.com/crotger/docsap

Conflicts:
	templates/docsap_home.html
	templates/profile.html
Merging in tim's changes
Fixed a few variable names.