Moved most things out of readme/main into site/
Merge remote-tracking branch 'origin/master'