merge for IRC and Travis CI config