Switch merge order in View\Environment::make()

This ensures variables passed to @include() override the variables from the calling view
Merge pull request #1171 from davejamesmiller/environment-make-bug

Switch merge order in View\Environment::make()