qMerge branch 'master' of github.com:rmcgibbo/mdtraj into file-object-length
qMerge branch 'file-object-length' of github.com:rmcgibbo/mdtraj into file-object-length
Moved the load_xxx methods out of trajectory.py, new registry