catch more import problems in cbook
Merge branch 'develop' of github.com:orbeckst/GromacsWrapper into develop