Removed need for Object.keys()
Merged upstream/master, manually resolved conflicts
Merge pull request #434 from blackshadowshade/433_object_keys

Removed need for Object.keys()