Fix G's changes to still support no-root build.
Merge branch 'devel' of github.com:cerati/mictest into devel
Merge branch 'devel' of github.com:cerati/mictest into devel
Integrate modified USolids