Fixing merge history to show shortest_paths properly
More git administrative madness
Merge pull request #23 from BFriedland/shortest_paths

Fixing merge history to show shortest_paths properly