Added Simulator for basic Generator
Merge branch 'master' of githubhoh:hoh/Hubbub

Conflicts:
	hubbub/generator/__init__.py