pull changes from master to dev on 2014-08-30

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1257: fix bug when Echo is the first button in a game
  * #1258: Don't allow default attack when there's a choice between Berserk/Power or Trip/Power.  Do allow default attack when fire dice exist but can't actually be used in any possible attacks. 
  * #1250: updated description of ornery skill
* Not (very) user-visible:
  * #1242: add ornery skill to python client
  * #1243: add unit test for mood/ornery

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.