needs more research to do right

I'll need to simply learn more about python to be able to handle this properly. At the moment, I'd be essentially mashing Roller and Combat together and not giving it justice.
code cleanup
Merge remote-tracking branch 'origin/master'