Squashed commit of the following:

commit f202a1eafdb7dfb20828db085c30bbd144efe2c8
Author: Jorge Polanco <dr.jorgepolanco@gmail.com>
Date:   Fri Dec 6 12:25:42 2013 -0600

    Add trip_distance method