Rearrange Trips controller and views.

Rearrange Trips controller and views.

Mike can now put maps work in trips#show