Removed stuff we do not need ever
Merge branch 'master' of https://github.com/grayape/scorekeeper

Conflicts:
	config/init.conf