Fix check for server file, test of arg count
Merge branch 'master' of https://github.com/alflanagan/my_emacs_stuff