Remove node-webkit, causing build errors
Merge remote-tracking branch 'origin/master' into feature/desktop-mac