Fixed minor linting errors
Merge branch 'master' of github.com:dmitrydwhite/pack-journal
Resolved merge conflicts
Trips API refactored to promises, passing tests
Resolved conflicts
Merge branch 'master' into trips-test-refactor
Merge pull request #25 from dmitrydwhite/trips-test-refactor

Trips test refactor