Minor refactoring before switch to strategy events.
Fixed events not firing in inherited strategies.
Merge branch 'master' of github.com:obi1kenobi/ascension-bot

Conflicts:
	main.py