Some cleanup of models
Commit before pull
Merge branch 'master' of https://github.com/ripperdoc/raconteur.git

Conflicts:
	world.py
Cleared models.py
Minor field change in world.py
Changed model_setup to be more MongoDB-compliant