Moves remainder of Combo code to Hero_Combo
Merge branch 'master' of https://github.com/anathema/anathema