More skill fixes.
Combined the changes to the demons.
Removed the test code.
Merge remote-tracking branch 'origin/master' into gh-pages