Squashed commit of the following:

commit df328ce19ebe18d725fe4712e25b229deb3ec65d
Author: Ben White <ben.white@utexas.edu>
Date:   Fri Dec 6 11:52:26 2013 -0600

    Add trip distance method. Close issue.