Merge remote-tracking branch 'origin/fix_travis_for_master'
Enable osx builds
Updated travis to distuish between mac and linux
Fix string comparison for travis
Merge remote-tracking branch 'devel/update_travis' into devel-master