ensure travis uses node v0.10, not v0.1
Merge branch 'master' into andrewrk-safe-functions