ENH: Get rid of hard-coded lbfgs. Closes #988.
Merge pull request #1364 from jseabold/fix-988

ENH: Get rid of hard-coded lbfgs. Closes #988.
STY: Import and pep 8 cleanup
Merge pull request #1365 from jseabold/ar-pep8

STY: Import and pep 8 cleanup