Optimized heros, swapped hero code for sub code

Signed-off-by: Chad Allen <chad@awsmlabs.com>
Merge branch 'master' of https://github.com/trevynmeyer/watts-clean