removed the authd tag from the travis script since it does not exist in the securedrop-travis.yml playbook.
removed trace of merge conflict for ubuntu_grsec doc