ignore trial temp folder
Merge remote-tracking branch 'bwagner-github/fix_tests_on_mac' into develop
Merge remote-tracking branch 'kali/ignore-trial-temp' into develop