In the middle of a Trigger refactor
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros

Conflicts:
	PixelPyrosNew/bin/PixelPyrosNewDebug.app/Contents/MacOS/PixelPyrosNewDebug
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros
Commit before serious trigger refactor.
Trigger refactor (again!)
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros