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

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1335: weak and mighty die skills
  * #1353: zero-sided dice, and Dead Guy button
  * #1342: display values for captured value dice so players can see how much they're worth
* Ideally not user-visible:
  * #1361: refactor some integration tests

Database updates:
```
01304_dead_guy.sql
```

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.