pulls nav_bar into partial rendered only in application layout.
tiny merge conflicts in trips#show and .gitignore
cleans up navigation bar
First - adds set_trip method to trips controller. Second - moves create trip button
clean up Create Trip button on trips#index
adds a push to feed layout
Merge pull request #82 from MarcGarreau/iron-out-wrinkle

Iron out wrinkles
Deconflicts merge