add berkeley-unix to special handing of FQDN
Merge pull request #45 from ecbrown/master

add berkeley-unix to special handing of FQDN
better to use magit and/or git-commit-mode
move ruby stuff into proper place
remove js and web stuff from misc-recommended
update the trial instructions

  as we're now using the after-init-hook, which isn't run when Emacs is
  launched with -q
Merge remote-tracking branch 'upstream/master'