Merge branch 'remove-setup-cfg' of github.com:rmcgibbo/mdtraj
Merge branch 'master' of github.com:rmcgibbo/mdtraj
update message
Merge pull request #285 from rmcgibbo/unit-message

Unit message