integration testing for routes/trips
merge master to branch
paginate trips list
merge with master, resolve conflicts
Merge pull request #5 from lizwilkins/viewify

View it and mergify!