Added some additional things
Added travis support