upgrade code for travis
fixed tabs
removed old version of node
Merge remote-tracking branch 'bradvin/V2' into V2