change to new solver code

@devoncarew 

changed to using latest code from pub for the solver - at least parts of it. pub get was not working on cde, solver could not handle all the constraints and path dependencies.
Some nits around indent here.