added certificates
updated client code (HUGE)
removed junk
Merge branch 'master' of https://github.com/gould/marmoset into test