Extracting problem to a more generic solver. Also switch the problem for performance speedups.
Merge pull request #12 from andrewhao/extraction-csp

Extracting problem to a more generic solver. Also switch the problem for...