Revert "Update Travis to gcc and add branch modern"

This reverts commit f772304a92ad971e29e35b9aa3ef34cbb4fb8f5d.