rename convergence methods and allow for more
Merge pull request #114 from andrewjpage/rename_converge_method

rename convergence methods and allow for more