portability changes
portability cleanups
Merge branch 'devel' of github.com:cerati/mictest into devel