Updated travis to distuish between mac and linux
Merge remote-tracking branch 'devel/update_travis' into devel-master