Merge branch 'master' of github.com:raviramanathan/mdtraj into raviramanathan-master
Add test to chi angle calculation and clean up logic slightly
Merge branch 'master' into chi
minor
new name
Merge pull request #232 from rmcgibbo/chi

Fixes for #224