Bump version to stable 2.x

Update Idea project files, keywords & etc.

Author: ghettovoice

.babelrc

@@ -19,10 +19,10 @@
     "umd": {
       "plugins": [
         [
-          "./modules/babel-plugin-transform-nested-import",
+          "./modules/babel-plugin-merge-imports",
           {
             "pkg": "openlayers",
-            "pkgVar": "_ol_",
+            "pkgVar": "__ol",
             "regex": "^ol(?:\/(.*))?$"
           }
         ]

.gitignore

@@ -1,43 +1,27 @@
-### Custom
-
-
-### Linux template
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
+.idea/**/workspace.xml
+.idea/**/tasks.xml
 .idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
 
 # Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
 
 # Gradle:
-.idea/gradle.xml
-.idea/libraries
+.idea/**/gradle.xml
+.idea/**/libraries
 
 # Mongo Explorer plugin:
-.idea/mongoSettings.xml
+.idea/**/mongoSettings.xml
 
 ## File-based project format:
 *.iws
@@ -58,18 +42,33 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+### Linux template
+*~
 
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
 ### Node template
-node_modules
 # Logs
 logs
 *.log
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 # Runtime data
 pids
 *.pid
 *.seed
+*.pid.lock
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
@@ -83,17 +82,36 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
+# Bower dependency directory (https://bower.io/)
+bower_components
+
 # node-waf configuration
 .lock-wscript
 
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
 # Dependency directories
-jspm_packages
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
 
 # Optional npm cache directory
 .npm
 
+# Optional eslint cache
+.eslintcache
+
 # Optional REPL history
 .node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "modules/babel-plugin-transform-nested-import"]
-	path = modules/babel-plugin-transform-nested-import
-	url = https://github.com/ghettovoice/babel-plugin-transform-nested-import.git
+[submodule "modules/babel-plugin-merge-imports"]
+	path = modules/babel-plugin-merge-imports
+	url = https://github.com/ghettovoice/babel-plugin-merge-imports.git

.idea/jsLibraryMappings.xml

@@ -14,10 +14,9 @@ seeded with [TileCache](http://tilecache.org/).
 Install it with NPM or Bower:
 
 ```shell
-npm install openlayers ol-tilecache
+// install both ol and openlayers packages
+npm install ol openlayers ol-tilecache
 bower install openlayers ol-tilecache
-// if you plan use ES2015 versionof the plugin
-npm install ol
 ```
 
 Or download the latest versions of OpenLayers and ol-tilecache and add them with script tags:
@@ -29,9 +28,10 @@ Or download the latest versions of OpenLayers and ol-tilecache and add them with
 
 ### Note
 **Plugin is available in 2 versions: as UMD module and as ES2015 module:**
-- **UMD version (`dist/bundle[.min].js`) should be used with [openlayers](https://www.npmjs.com/package/openlayers) package.**
+- **UMD version (`dist/bundle[.min].js`) should be used with [openlayers](https://www.npmjs.com/package/openlayers) package.
+  You can install `ol` package as dev dependency to suppress NPM warning about required peer dependencies.**
 - **ES2015 version (`dist/bundle.es.js`) should be used with [ol](https://www.npmjs.com/package/ol) package (you should
-  install it manually)``**
+  install it manually). You can install `openlayers` package as dev dependency to suppress NPM warning about required peer dependencies.**
 
 ## Usage
 
@@ -114,8 +114,8 @@ npm install
 # build UMD module
 npm run build
 npm run build-min
-# or 
-npm run build-all
+# or build all 
+npm run build
 
 # run test app
 npm start

.idea/vcs.xml

@@ -9,7 +9,13 @@
   "keywords": [
     "ol",
     "openlayers",
-    "tilecache"
+    "tilecache",
+    "ol-tilecache",
+    "tile url function",
+    "map",
+    "mapping",
+    "ol plugins",
+    "openlayers plugins"
   ],
   "homepage": "https://github.com/ghettovoice/ol-tilecache",
   "repository": {