Updated based on running link checks using http://validator.w3.org/checklink