pull changes from master to dev on 2014-05-11

This update brings these approved pulls to the dev branch, so they can be tested on dev.buttonweavers.com:
* User visible:
  * #850: fix internal error bug on tied rounds involving option dice
  * #847: change "Button Men Online Game" in page titles to "Button Men Online"
* Not user visible:
  * #831, #855: make some API variables more consistent, and update jenkins to okay the longer consistent names

No database updates.