Fixed bug in trajectory join when discard_overlapping_frames is True, but frames are not identical
Grab proper frame when discard_overlapping_frames=True in trajectory.join()
Merge pull request #136 from synapticarbors/join-fix

Fixed bug in trajectory join when discard_overlapping_frames is True, but frames are not identical
bugfix to #136 and dealing with issue #138
fix test failures
Merge pull request #139 from rmcgibbo/traj3

bugfix to #136 and dealing with issue #138
merge in master