Merge branch 'develop' of https://github.com/ivankravets/platformio into develop

README.rst

@@ -59,7 +59,7 @@ settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
 * Configurable `build -flags/-options <http://docs.platformio.org/en/latest/projectconf.html#build-flags>`_
 * Automatic **firmware uploading**
 * Integration with `development environments (IDE) <http://docs.platformio.org/en/latest/ide.html>`_
-* Ready for **cloud compilers**
+* Ready for **Cloud Compiling** and **Continuous Integration**
 * Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/#!/platforms>`_
 
 .. image:: https://raw.githubusercontent.com/ivankravets/platformio-web/develop/app/images/platformio-embedded-development.png

docs/ide.rst

@@ -39,9 +39,11 @@ VIM
 Recommended bundles:
 
 * Syntax highlight - `Arduino-syntax-file <https://github.com/vim-scripts/Arduino-syntax-file>`_
-* Code Completion - `YouCompleteMe <https://github.com/Valloric/YouCompleteMe>`_
+* Code Completion - `YouCompleteMe <https://github.com/Valloric/YouCompleteMe>`_ (see configuration example by **Anthony Ford** `PlatformIO/YouCompleteMe Integration <https://gist.github.com/ajford/f551b2b6fd4d6b6e1ef2>`_)
 * Syntax checking - `Syntastic <https://github.com/scrooloose/syntastic>`_
 
+
+
 Put to the project directory ``Makefile`` wrapper with contents:
 
 .. code-block:: make

scripts/get-platformio.py

@@ -99,7 +99,7 @@ def main():
         ("Fixing Windows %PATH% Environment", fix_winpython_pathenv, []),
         ("Installing Python Package Manager", install_pip, []),
         ("Installing PlatformIO and dependencies", install_pypi_packages, [
-            [["platformio"], [
+            [["setuptools"], ["platformio"], [
                 "--egg",
                 "http://sourceforge.net/projects/scons/files/latest/download"
             ]]