Bug introduced after scipy optimization: debugging.
Fixed bug, coverging correctly again.
Fixed bug in new loading utility.
Updated old-state to master.
Updating old-state to master.
Updating old-state to master.
Merge branch 'master' into old-state
Bugs with loading utility cleared up.