Fix/desktop build

This fixes some issues when building the `desktop` app and is overall cleaner.

:warning: I've still got one minor conflict left between `nwbuild.sh` and `grunt-node-webkit-builder`. After that's fixed we can merge @SamyPesse