* add some extraneous whitespace to make jenkins unhappy
* undo test whitespace change
* more testing with too much whitespace
* revert whitespace change again
* add new defaults to jenkins_buttonmen build template
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 1135_jenkins_yellow
Reordered columns in die table to match dev/prod
Added basic infrastructure (but no functionality) for BMSkillWeak
Removed BMDieSwing->split() and BMDieOption->split() so that splitting does not cause the dice to lose their swing or option character.
Added BMDie->shrink() and BMDie->grow() placeholders, as well as BMDieTwin versions
Added logic to stop trip dice morphing after an unsuccessful attack
Added die flag for unsuccessful attacker
Added logic for BMDie->shrink() and BMDie->grow()
Added Mighty die skill
Updated Python client to add abbreviations for weak and mighty
Changed behaviour of default attack when the only options are power and skill and there is fire assistance available: now, Power will always be selected
- Added new die flag BMFlagForceDisplayValue, for use with value dice
- Cause value dice to have the new die flag
- Added code to cause UI to display values when it sees the die property ForceDisplayValue
Started adding QUnit tests
reggie rage, ZOEcon, Cowboy Bebop, others not yet in database
Merge pull request #1330 from blackshadowshade/1298_table_column_order

Reordered columns in die table to match dev/prod