Added kidnap plot changes for test.
Fixes to spells + balancing fixes.
Merge branch 'master' into complex_plots