pull changes from master to dev on 2014-06-17

This update brings these approved pulls to the dev branch:
* User visible:
  * #1005: add initiative and die rolls to action log
  * #1006: improve style of skill description links
* Ideally not user-visible:
  * #1004: add logic for whether each player can still win to the API (no UI for this yet)