Build system cleanup

Nicolas Fellarequested to merge
work/nico/buildsystem-cleanup into master

A handful of things, but nothing major

Merge request reports