Fixed broken links and other edits
Merge pull request #280 from TekHus/master

Fixed broken links and other edits
Fixed merge conflicts
Merge pull request #281 from TekHus/master

Fixed merge conflicts
Merge pull request #780 from KevWright/master

Fixed broken links and other edits