don't test on Node 0.6
Merge remote-tracking branch 'origin/master' into simplify