merge NIFTy_5, cosmetics

9 jobs for non-blocking-plots in 7 minutes and 56 seconds (queued for 1 second)