Added choice of "\beta_n" factor calculation in CG

Currently supports Fletcher-Reeves and Polak-Ribiere; haddock changes as
well