Merge branch 'terencehill/eraseable_functions'

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/lib/counting.qh
Simple merge

diff --cc qcsrc/lib/cvar.qh
Simple merge

diff --cc qcsrc/lib/vector.qh
Simple merge