Merge remote-tracking branch 'upstream/master'

Conflicts:
	LocalScripts/LaunchNotebookServer.py
	notebooks/eigenfaces/EigenFaces.ipynb
	notebooks/sklearn_Yoav/06_iris_dimensionality.ipynb
	notebooks/weather/.ipynb_checkpoints/Weather Analysis-checkpoint.ipynb
	notebooks/weather/Weather Analysis.ipynb
Merge branch 'master' of https://github.com/lmf90409/UCSD_BigData

Conflicts:
	LocalScripts/LaunchNotebookServer.py
	notebooks/weather/Weather Analysis.ipynb