Fixed a link
Removed a link
Merge pull request #169 from TekHus/big-edits-and-moves

Big edits and moves
Merge pull request #647 from KevWright/master

Big edits and moves