Editted get_trip and trip_return functions
Merge branch 'trip' of https://github.com/khalua/travlr into trip