Fixes mess with missing conditions for bindings.gyp
Merge pull request #20 from LazerUnicorns/linux-bindings

Fixes mess with missing conditions for bindings.gyp
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fixes mess with missing conditions for bindings.gyp

Conflicts:
	binding.gyp