Bug fixes
Merge branch 'TrashDBClasses' of http://github.com/tunnell/wax into TrashDBClasses

Conflicts:
	wax/EventBuilder/Processor.py