Fixed some incorrect licenses.
Bug fix for #300.
Unignored some tests which now pass.
Tweaks for solver
Merge branch 'devel' of github.com:DavePearce/Whiley