Squashed commit of the following:

commit 3d551da5530315c708e7decba39f7bcbb1ea6f00
Author: Chris Jones <chris@christopherjones.us>
Date:   Tue Apr 9 20:49:16 2013 -0800

    Added trips