Upgrades to work with node v0.10.x

Note these changes will deprecate node v0.6.x usage