Merge branch 'master' into 2.0

# Conflicts:
#	src/AwsServiceProvider.php

Author: jeremeamia

config/config.php renamed to config/aws.php

@@ -1,4 +1,6 @@
-<?php return [
+<?php
+
+return [
 
     /*
     |--------------------------------------------------------------------------

src/AwsServiceProvider.php

@@ -22,13 +22,13 @@ class AwsServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        $config = realpath(__DIR__ . '/../config/config.php');
+        $source = realpath(__DIR__ . '/../config/aws.php');
 
-        $this->mergeConfigFrom($config, 'aws');
-
-        if (function_exists('config_path')) {
-            $this->publishes([$config => config_path('aws.php')], 'config');
+        if (class_exists('Illuminate\Foundation\Application', false)) {
+            $this->publishes([$source => config_path('aws.php')]);
         }
+
+        $this->mergeConfigFrom($source, 'aws');
     }
 
     /**
@@ -39,7 +39,6 @@ public function boot()
     public function register()
     {
         $this->app->singleton('aws', function ($app) {
-            // Retrieve config.
             $config = $app['config']->get('aws');
             if (isset($config['config_file'])) {
                 $config = $config['config_file'];