Minor tweaks

Note that tests already fail for master before these changes after https://github.com/h5bp/server-configs-node/pull/36