Maintains state variable ordering
Merge pull request #801 from scopatz/ord

Maintains state variable ordering