Fixes a compile bug after the move.
Moves SharpFlame to SharpFlame.Old.
Merge Master into eto.