m_delaymsg Add option to disallow NOTICEs too
Fix some small bugs in the makefile template.

- GCC in C++ mode should be called g++ not gcc.
- ICC in C++ mode should be called icpc not icc.
Use clang++ on FreeBSD 10 instead of g++.
Merge pull request #940 from SaberUK/insp20+fix-makefile

[2.0] Fix some small bugs in the makefile template.
Use gnutls_rnd instead of gcry_randomize on newer GnuTLS versions.

This is a modified version of 690c372. Fixes #905.
Merge pull request #944 from SaberUK/insp20+gnutls-rnd

[2.0] Use gnutls_rnd instead of gcry_randomize on newer GnuTLS versions.