Merge remote-tracking branch 'origin/wohlgemuth' into aws

# Conflicts:
#	requirements.txt
#	scripts/plot_profit.py

requirements.txt

@@ -1,12 +1,12 @@
-ccxt==1.11.149
+ccxt==1.14.24
 SQLAlchemy==1.2.7
 python-telegram-bot==10.1.0
 arrow==0.12.1
-cachetools==2.0.1
+cachetools==2.1.0
 requests==2.18.4
 urllib3==1.22
 wrapt==1.10.11
-pandas==0.22.0
+pandas==0.23.0
 scikit-learn==0.19.1
 scipy==1.1.0
 jsonschema==2.6.0
@@ -20,8 +20,9 @@ hyperopt==0.1
 #networkx==1.11
 git+git://github.com/berlinguyinca/networkx@v1.11
 tabulate==0.8.2
-coinmarketcap==4.2.1
 simplejson
+coinmarketcap==5.0.3
+
 # Required for plotting data
 #plotly==2.3.0