Added travis support and testing hotfixes