Added custom metric (almost)
Merge branch 'mychanges'

Conflicts:
	msmaccelerator/model/modeler.py
Merge branch 'master' of git@github.com:rmcgibbo/msmaccelerator2.git
Merge branch 'master' of github.com:rmcgibbo/msmaccelerator2
Added support for custom metrics

Added new configurable options and a method for loading a pickled metric
Addressed concerns with custom metric code
Updated modeler configurables for custom metric
Merge pull request #21 from rmcgibbo/mph

Custom metric