Merged latest changes from ipalaus

Author: DODMax

.gitignore

@@ -1,4 +1,6 @@
+/.idea
+/build
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store

README.md

@@ -4,7 +4,7 @@ Eloquent Geonames
 [![Build Status](https://travis-ci.org/ipalaus/geonames.png?branch=master)](https://travis-ci.org/ipalaus/geonames)
 [![Coverage Status](https://coveralls.io/repos/ipalaus/geonames/badge.png?branch=master)](https://coveralls.io/r/ipalaus/geonames?branch=master)
 
-A collection of Eloquent models and Commands to get all the power of GeoNames in Laravel 5.1.
+A collection of Eloquent models and Commands to get all the power of GeoNames in Laravel.
 
 Installation
 ------------
@@ -14,11 +14,13 @@ Add `ipalaus/geonames` as a requirement to composer.json:
 ```javascript
 {
     "require": {
-        "ipalaus/geonames": "1.0.*"
+        "ipalaus/geonames": "3.0.*"
     }
 }
 ```
 
+**Note**: if you're using Laravel 5.1 you can use the version `"ipalaus/geonames": "2.0.*"`.
+
 Update your packages with `composer update` or install with `composer install`.
 
 Once you have installed the dependency, you need to register `geonames` in Laravel. Open your

build/.gitignore

@@ -22,11 +22,11 @@
         "illuminate/database": ">=5.1.0",
         "illuminate/filesystem": ">=5.1.0",
         "illuminate/support": ">=5.1.0",
-        "symfony/process": "2.7.*"
+        "symfony/process": "2.8.*|3.0.*"
     },
     "require-dev": {
-        "mockery/mockery": "0.8.0",
-        "phpunit/phpunit": "3.7.*"
+        "mockery/mockery": "~0.9.2",
+        "phpunit/phpunit": "~4.1"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -336,4 +336,4 @@ public function line($string)
 		//
 	}
 
-}
+}