mdtraj compatibility fixes
Merge branch 'develop' of https://github.com/sallai/mbuild into develop