fixed all spacing, refactored adjaceny calculation, and calculate a shortest path in Location (naive for now)
resolved merge conflicts and re-indented
Merge pull request #7 from adamreis/adam_path_calc

Added naive path calculation and fixed spacing