Added logic to allow ambiguous one-on-one no frills attacks to happen by default
Merge remote-tracking branch 'upstream/master' into 1164_default_power_skill
Added logic to allow for one-on-one-no-frills default attacks
Re-added logic to handle invalid default attack
Merge pull request #1171 from blackshadowshade/1164_default_power_skill

Default now allows one-on-one no-frills attacks