cleaned up calcs

cleaned up R scripts for calculations and graphs, plus data sets for oil
supply and oil prices