update 2a/3a to mirror the structural changes to 1a, closes #74
Merge branch 'v3' of github.com:telehash/telehash.org into v3