Merge pull request #15 from jblowe/master

PAHMA-757: add 'check server' button, other minor fixes
PAHMA-757: last two little mods