Merge branch 'donkey' of https://github.com/despondentdonkey/bpm into donkey

Conflicts:
	.gitignore
Merge branch 'develop' of https://github.com/despondentdonkey/bpm into donkey

Conflicts:
	.gitignore
Made states init when using State.set.