merging with upstream commit 7d8eba0d996a424151f9b4f424a419478abd1ee0
rumble brought up to parity with junkyard.rb. also minor tweaks to card text and help regexp.