Half the changes
Vast majority of TOS changes
Merge branch 'tos-changes'
Add TOS link to site