Align with suggested laravel config practices (#145)

Author: matthewnessworthy

src/AwsServiceProvider.php

@@ -27,14 +27,13 @@ class AwsServiceProvider extends ServiceProvider
     public function boot()
     {
         if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
-            $this->publishes([
-                dirname(__DIR__).'/config/aws_publish.php' => config_path('aws.php')
-            ]);
+            $this->publishes(
+                [__DIR__.'/../config/aws_publish.php' => config_path('aws.php')],
+                'aws-config'
+            );
         } elseif ($this->app instanceof LumenApplication) {
             $this->app->configure('aws');
         }
-
-        $this->mergeConfigFrom(dirname(__DIR__).'/config/aws_default.php', 'aws');
     }
 
     /**
@@ -44,6 +43,11 @@ public function boot()
      */
     public function register()
     {
+        $this->mergeConfigFrom(
+            __DIR__.'/../config/aws_default.php',
+            'aws'
+        );
+
         $this->app->singleton('aws', function ($app) {
             $config = $app->make('config')->get('aws');