Simplified mrjob.conf configuration
Adding new notebook:

  - that answers the 'questions to get started'
Merge branch 'master' of https://github.com/yoavfreund/UCSD_BigData

Conflicts:
	utils/Make.mrjob.conf.py