Changed plot_and_save to save plots in both png and eps format. Resaved data