Revert "travis, cleanup compiler handling"

This reverts commit 7b92714728fe74001e8adeae5b8719e977728caa.
travis, correct and add mingw case