wip, and broken commit
merging master in so we have maven during this refactor
Merge branch 'master' into trip-refactor
refactor working, tests pass.. let's make sure the model is right before merging
merging master in, minor bug fixing
Merge pull request #6 from chorankates/trip-refactor

trip refactor