Cleanup, added gnutls and c99sh