Add afpfs support
Remove, not needed anymore
Merge pull request #136 from quasar1/Gotham

Synce Gotham from test repo