fix class/module confusion
Merge branch 'master' into milestones

Conflicts:
	lib/trueachievements.rb