Merge branch 'development' into 346-user-rate-limits

# Conflicts:
#	README.md

Fixes in documentation merged from development:

* Remove cd into dataservices-api: all example snippets have comments about the intended  initial path
* Installing the python module was missing (replaced by installing dependencies);
  it should not be necessary in general to use the upgrade options to install dependencies

README.md

@@ -44,6 +44,7 @@ Steps to deploy a new Data Services API version :
     ```
     # in dataservices-api repo root path:
     cd client && sudo make install
+    cd -
     cd server/extension && sudo make install
     ```
 
@@ -51,7 +52,7 @@ Steps to deploy a new Data Services API version :
 
     ```
     # in dataservices-api repo root path:
-    cd server/lib/python/cartodb_services && sudo pip install . --upgrade
+    cd server/lib/python/cartodb_services && pip install -r requirements.txt && sudo pip install . --upgrade
     ```
 
 - install extensions in user database