Add Automatch tab to User Settings, and use those settings along with
any game-specific settings whenever an automatch request is submitted.
allow longer lines for jslint
replace goko's end turn button with one far out of the way on the
sidebar to reduce the chance of turn-ending misclicks
Merge pull request #239 from michaeljb/better-end-turn

Better end turn
Increment for beta release of "Better End Turn"
Fix multiple instances of better end turn button
Merge pull request #240 from aiannacc/better-end-turn-fix-multiple-buttons

Better end turn fix multiple buttons

Confirmed a new End Turn button was created each time a new game was started, and this change fixes that. Tested in Chrome 35 on Mavericks.
make betterEndTurn a more generic alternateButtons module, add an
alternate button for "End Actions". #241
reposition alternate buttons so they don't mess with the game log when
VP counter is turned off.
Merge branch 'origin/unified-automatch-settings' into beta
Merge remote-tracking branch 'remotes/origin/unified-automatch-settings' into beta
Merge remote-tracking branch 'remotes/origin/alternate-buttons' into beta
Merge pull request #242 from aiannacc/alternate-buttons

Alternate buttons module and new "End Actions" button
Merge pull request #238 from aiannacc/unified-automatch-settings

Unified automatch settings
Increment to v2.5.4.7 for beta release
Merge branch 'beta' of https://github.com/aiannacc/Goko-Salvager into beta
Fix autokick bug, increment to 2.5.4.8
Add Prince to kingdom generator
Increment for beta release
Remove "beta" description