remove deprecated stuff from clang base template
Merge pull request #367 from uwescience/bmyerz/minor-from-last-PR

remove deprecated stuff from clang base template
Merge branch 'master' into shumo_hc_tie_breaking_heuristic