Handle extra warnings more grecefully
Merge branch 'cmake-improvements' into travis