removes conflicts after rebase against master
Adds linear extrapolator method
Bug fix to linear_extrapolator method and adds unit test
Adds xfail test command to added unit test
Improves flux_point API, adds lafferty method and unit tests/example