Implemented view for TripsController#show
*Implemented javascript to render a map showing the current route
*Limitation: no tests as of yet
*Need to calculate duration of trip
*Need to implement a condition for the trips waypoints
Revised script rendering map route to accomodate errand routes
Merge branch 'master' into trip_tdd

Conflicts:
	app/controllers/trips_controller.rb
	app/views/layouts/application.html.erb
	app/views/trips/show.html.erb
fixed merge conflicts
added test for duration
added a trip duration instance variable in TripController#show with conditional if there are errands or not
Implemented Original Duration to trip
*Added test to TripsController#create to ensure original duration is not 0
*Ammended TripsController#create to utilize Distance matrix helper to determine duration of trip
*Ammneded TripsCOntroller#show to create a variable for the duration
added time_in_minutes application helper to convert duration of trip to a string
modified trip#show to display trip duration in minutes instead of seconds
fixed merge conflicts
Resolved geocoder courtesy query limits
*Added geocoder initializer in config file to utilize bing and cache results
*debugged  TripsController#create to make tests pass
* all tests passing
Merge pull request #29 from LightningLord/trip_tdd

Trip tdd