Last commit of the continuous version

Will now proceed to grid the model, to make it run faster
Also, change make_season to make_trip.
sub_routines.jl minor changes, pulling in update from master
merge head should not exist
Working parallelization of trips via a parallel for loop. OUT temporarily non-functional.