Add memwatch as development dependencies
Merge branch 'master' into unstable
Update nan to v0.6.0