Squashed commit of the following:

commit 82c1d008864803e47be12695f4220ede5b27cde8
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Sat Mar 16 23:57:20 2013 -0700

    Refactors tokens

commit d82a31bbffe6143b0a29f96d2803f651309dbcaf
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Sat Mar 16 23:47:59 2013 -0700

    Hepz done.

commit 841ca59f4f1b92a3c8c3ecbbf2271383cd101c2f
Merge: fe454b0 d8e9b51
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Sat Mar 16 21:03:21 2013 -0700

    Everything but token list and ults should work

commit fe454b072261ad0694b0faaf21b9f45d05308126
Merge: 928fb24 59e8223
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Fri Mar 15 21:51:01 2013 -0700

    Merge remote-tracking branch 'origin/master' into add-hepzebah

commit 928fb242b34a12f598ec7034af1057bc4908cd95
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Fri Mar 15 21:49:07 2013 -0700

    First try for altazziar

commit 0c90141df54c84dd183588addebeadb42c19ec97
Merge: d3c7284 9075bfd
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Fri Mar 15 17:50:59 2013 -0700

    Merge remote-tracking branch 'origin/master' into add-hepzebah

commit d3c7284082ba8250de828af2fb3f244c01e14944
Merge: 52d827d ca7fabe
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Thu Mar 14 22:55:05 2013 -0700

    Merge branch 'HEAD', remote-tracking branch 'origin/master' into add-hepzebah

commit 52d827d1244b7161ff153539370c3355d0f17516
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Thu Mar 14 22:50:21 2013 -0700

    Yet more hepz. on_reveal! bonuses now work

commit 43b12cd71b949a17026899cc979e0d3c939c7c7e
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Thu Mar 14 19:36:52 2013 -0700

    More work on hepz

commit 142ca3176436a422ea7d5c217a8a382df1f38a92
Author: Daniel Spencer <dspencer@squareup.com>
Date:   Tue Mar 12 13:25:31 2013 -0700

    only lose 1 life per ante.

commit bcdd67f5b7327e4b1c1e3a56880a79fef58c9509
Author: Daniel Spencer <dspencer@squareup.com>
Date:   Tue Mar 12 11:45:34 2013 -0700

    Adds hepz' cards.

commit 12e9a60bfacf8cda5aeb4b37d4cbffec952c74f2
Merge: 82c4e81 ffe9cd3
Author: Daniel Spencer <dspencer@squareup.com>
Date:   Tue Mar 12 11:30:08 2013 -0700

    Merge branch 'master' into add-hepzebah

    * master:
      consolidates into a single catch/throw block.
      consolidates event logging, and adds the ability to speicfy a maximum event number to proceed to
      fix text on sturdy.
      Fixes text on sturdy.
      Fixes sinuous text.
      fixes distortion.
      Fixes some paradigm stuff.
      Zaams finishers.
      more info on zaam's paradigms.
      Adds descs for zaam and heketch.
      Character preview works a little bit better, now.
      Adds tooltip for buttons that need it. Also adds in descs for heketch finishers.
      Fix discard hovers.
      Distortion is now flagged as such.
      Provide host to actionmailer in production.
      Fixes merciless, adds logging for life loss.
      fixes challenge email.
      there we go.
      Moves selection buttons up.
      Moves submit buttons directly below the event log.

    Conflicts:
    	lib/character.rb

commit 82c4e818a2dfd63c74704f319e41de60b2c98e6b
Merge: 38de7f4 b201f84
Author: Daniel Spencer <dspencer@squareup.com>
Date:   Mon Mar 11 00:05:29 2013 -0700

    Merge branch 'master' into add-hepzebah

    * master:
      Adds user settings page, adds email notifications.
      only chime if not active tab.
      Fixes links in challenge emails.
      Adds user mailer with challenge message.
      Actually adds chime audio.
      Adds settings to send emails from gmail.
      Adds chime when you have new required input.
      fix psycho advance.
      fix timing on urgent.
      adds merciless's passive effect.
      Rasping gets life regain.

commit 38de7f4df9b2c88b2ac49a1dddf8fcc343f184bf
Merge: 6d784d9 6408297
Author: Daniel Spencer <dspencer@squareup.com>
Date:   Sun Mar 10 12:49:51 2013 -0700

    Merge branch 'master' into add-hepzebah

    * master:
      Styles actually index into styles... herp derp.
      Don't show special action box at start.
      Previews now use the bootstrap popover
      Fixes typo.
      Fixes and finishers for reggie and khadath.
      Adds descriptions of zaam and reggie cards. Also adds todos
      zaam and reggie are in beta, not ruk and khadath.
      minor fixes for heketch.
      updates names of triggers.
      Adds missing lose_life method.
      Adds zaam.
      Test GamePlay#game_state in autospec.
      Fixes for reggie.
      Updates trigger execution to work with changing trigger sources.
      updates reggie for finishers
      Adds heketch

    Conflicts:
    	lib/character.rb
    	lib/game_play.rb

commit 6d784d99ab75287b9b33710396c6d17a57445921
Author: Daniel Spencer <dspencer@squareup.com>
Date:   Sun Mar 10 12:17:25 2013 -0700

    Fixes bugs and code style.

commit d85bbd0fe9bafb432dab99a8ab0faee9f2a9a7fe
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Sun Mar 10 11:33:11 2013 -0700

    Hepzibah mostly done

commit aaa6858064c46797818ba1c484a3e2227b45d99e
Author: Aaron Kanter <alkanter@gmail.com>
Date:   Sat Mar 9 17:25:59 2013 -0800

    Adds lose_life/gain_life, start of hepz
Fixes hepzibah's description
Fixes hepzibah's description