Hack to fix change to sortkey option values
Increment to v2.5.1.3 for emergency 'sortkey' fix
Merge branch 'chat' of https://github.com/aiannacc/Goko-Salvager into chat

Conflicts:
	config.rb
Minor refactoring
temp commit -- for moving files to other machine