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

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1382: fix a bug in which value dice were displaying their values unnecessarily
* Not user-visible:
  * #1375, #1376, #1380: small phpunit/jenkins fixes to make the tests a faster, easier to run, and more informative

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.