Rock was doing a dash_jump after an air_dash

That's not right
When holding left and right at the same time

The correct things happen now:
- megaman stops but is still facing in the primary
  direction
- megaman can dash from the stop, and goes in the right
  direction, but jumps from the stop are straight up
updating the steps file
Merge branch 'master' into tertiary_entities