Merging in a few simple typo fixes as well as old link reference fixes into master for deployment to Heroku