Adds lose_life/gain_life, start of hepz
Hepzibah mostly done
Fixes bugs and code style.
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
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.
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
Adds hepz' cards.
only lose 1 life per ante.
More work on hepz
Yet more hepz. on_reveal! bonuses now work
Merge branch 'HEAD', remote-tracking branch 'origin/master' into add-hepzebah
Merge remote-tracking branch 'origin/master' into add-hepzebah
First try for altazziar
Merge remote-tracking branch 'origin/master' into add-hepzebah
Everything but token list and ults should work
Hepz done.
Refactors tokens
Cadenza uses token pool, fixes bug with heketch.
removes duplicate methods.
Fixes indentation on hepz.