fixes and more clean up
Merge branch '10' of https://github.com/sunderhaus/voteStream into 10

Conflicts:
	app/templates/sessionlist.html