cleaned up functions
changed versions or something
Merge branch 'master' of github.com:daftscience/daftscience into devel

Conflicts:
	static/js/counter.js
	templates/counterIncludes.html
	templates/layout.html