Merge branch 'master' into working_on_demos

nifty/field.py

nifty/minimization/descent_minimizer.py

nifty/minimization/line_searching/line_search.py

...y/minimization/line_searching/line_search_strong_wolfe.py

nifty/minimization/relaxed_newton.py

nifty/minimization/steepest_descent.py

nifty/minimization/vl_bfgs.py