* 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
Merge branch 'master' of github.com:buttonmen-dev/buttonmen
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 1135_jenkins_yellow
Merge branch 'master' of github.com:buttonmen-dev/buttonmen
* only use Default attack in responderTest when there's some tenuous reason to believe it will be interesting to do so
Merge pull request #1375 from cgolubi1/1135_jenkins_yellow

color the build yellow when any PHP warnings are seen
Merge pull request #1376 from cgolubi1/1168_fewer_default_attacks

responder tests should make fewer Default attacks
* current version of phpunit.phar likes to be executed explicitly rather than included from another test
Merge pull request #1380 from cgolubi1/debug_vagrant_vbox_phpunit

current version of phpunit.phar likes to be executed explicitly rather than included
Only show value of value dice for captured dice
Merge pull request #1382 from blackshadowshade/value_display

Only show value of value dice for captured dice
Merge pull request #1383 from buttonmen-dev/master

pull changes from master to dev on 2014-10-29