Merge.

diff --cc js/jslib.js
Simple merge

diff --cc js/ui/baseui.js
Simple merge

diff --cc js/ui/panes/options.js
Simple merge

diff --cc static/panes/about.html
index ef977d531ed8d9eda9119f262ac529720686f724,604bbc11aaf0881380889672ac0f82e980bae7b7..065aecd4d43ad7de712423b0a17ac1f5715e6ca0
--- 1/static/panes/about.html
--- 2/static/panes/about.html
+++ b/static/panes/about.html
@@@ -52,6 -44,6 +52,6 @@@
      </tr>
    </table>
  
-   <p>Special thanks to various comments/suggestions/hardware/bug reports from Zarjazz, Bazerka, boojah, meeb, Microbe, morphium, Starman, truff, coekie, qip, soczol, tomaw, Simos, the muppets in #rogue (hi dunks!) and everyone else I forgot :(.</p>
 -  <p>Special thanks to various comments/suggestions/hardware/bug reports from Zarjazz, _nalle, Bazerka, boojah, meeb, Microbe, morphium, Starman, truff, coekie, qip, soczol, tomaw, #rogue (hi dunks!), gm and everyone else I forgot.</p>
++  <p>Special thanks to various comments/suggestions/hardware/bug reports from Zarjazz, _nalle, Bazerka, boojah, meeb, Microbe, morphium, Starman, truff, coekie, qip, soczol, tomaw, Simos, the muppets in #rogue (hi dunks!), gm and everyone else I forgot.</p>
    <input type="submit" value="Close" class="close" />
  </div>