Refactor code and add real Income to GDP plot

This commit moves the R code to plot CPI into its own file and replaces
the GDP code with this general purpose code.  It also changes the GDP
plots to also include gross domestic income.