Removed custom OrderedDictionary class and fixed missing references
removed commented lines
Merge pull request #34 from delasteve/remove-ordered-dictionary

Remove ordered dictionary