Resolve conflicts.
Don't fail if layered shallow water solver was not compiled.
Print error message if layered sw solver does not import.
Don't compile layered shallow water solver.
Don't compile layered shallow water solver.
Merge pull request #64 from ketch/dont_fail

Dont fail if layered shallow water solver won't compile