Merge branch 'master' into rick

Conflicts:
	app/views/compare.html
fixing some errors
Merge branch 'master' of https://github.com/IdeaHaven/influence