Unclear. I think Im initializing after a buildout?
Merge branch 'master' of github.com:econne01/yahoo-stock-db

Conflicts:
	bootstrap.py
	buildout.cfg
	setup.py