another upstream merge, looks like this rumble fork might no longer be necessary! :D
fixed weird downstream regression in junkyard.rb, i blame git.
Merge remote-tracking branch 'upstream/master'
fixed card description regexps so they're more sane. and a teensie bit more gratuitous bolding
Merge pull request #6 from victort/master

regexp fixes for help on cards