* set a reasonable hostname for puppet to use for each host, and always have mail from masquerade as buttonweavers.com
Merge pull request #573 from cgolubi1/557_confirmation_spam

mail From domain should always masquerade as buttonweavers.com
* implement Jota's multicolored game UI
* rearrange completed game page to look a bit better
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 520_ui_fixes
Merge pull request #574 from cgolubi1/520_ui_fixes

520 ui fixes
Fixed loading logic for altered recipes from database
Merge pull request #578 from blackshadowshade/571_echo_swing_reset

Fixed loading logic for altered recipes from database
* user interface for auxiliary die selection
* add a unit test for form submission
* add UI for selecting reserve dice
* fix whitespace at ends of lines
* chat/actionlog colors should match gameplay colors
Merge pull request #580 from cgolubi1/89_auxiliary_ui

UI for deciding whether to use auxiliary dice
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 96_reserve_ui
Merge pull request #582 from cgolubi1/96_reserve_ui

add UI for selecting reserve dice
Merge pull request #590 from cgolubi1/583_log_colors

* chat/actionlog colors should match gameplay colors
Merge branch 'master' into 93_option