restoring some of Josh's work that I reset
forgot to update start script to use correct node-webkit.app location
Merge remote-tracking branch 'upstream/master'