TEST: adding more tests to catch differen scipy versions
Added more failsafes for old scipy versions
Resolved conflicts
DOC: changed 0.12+ to >= 0.12
Merge pull request #476 from Garyfallidis/fix_optimize_defaults

Fix optimize defaults for older scipy versions for L-BFGS-B