Merge pull request #14 from vikinghug/development

Development update
Vikingmode functionality
Vikingmode!
Fixed warrior
VikingSettings support for VIKINGMODE!
Fixed settings and the ugly code
One more fix
Rebuilt from latest testbatch
merged
Merge branch 'merge'