pretty up the trips view, add auth controller specs
nest passenger in trips and work on routes for that
merge master and resolve conflicts
Merge pull request #3 from lizwilkins/specs

All spec 'n' span!