update for recent work

Jimmy Brush requested to merge update_ci into master Dec 15, 2017