Deprecated survfit.formula so would not overlap with function in survival
   * Added function npsurv, survplot.npsurv
   * REMOVED survfit.formula
   * Used new type argument to label.Surv for fitting functions