Geting better with Git and splitting the project. One branch will be a full build for the raspberry pi, the other will be an npm package if I ever decide to publish this project.
Decided to split the project. One branch is compiled specifically for the Rasberry pi, the other is stripped and set to be a node package.
Merge branch 'rpi' of https://github.com/stimularity/NaturalNodeLamp into rpi

Conflicts:
	node_modules/node-gyp/node_modules/fstream/.travis.yml
	node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/.npmignore
	node_modules/node-gyp/node_modules/mkdirp/.npmignore
	node_modules/node-gyp/node_modules/mkdirp/.travis.yml
	node_modules/node-gyp/node_modules/mkdirp/LICENSE
	node_modules/node-gyp/node_modules/mkdirp/examples/pow.js
	node_modules/node-gyp/node_modules/mkdirp/index.js
	node_modules/node-gyp/node_modules/mkdirp/readme.markdown
	node_modules/node-gyp/node_modules/mkdirp/test/chmod.js
	node_modules/node-gyp/node_modules/mkdirp/test/clobber.js
	node_modules/node-gyp/node_modules/mkdirp/test/mkdirp.js
	node_modules/node-gyp/node_modules/mkdirp/test/perm.js
	node_modules/node-gyp/node_modules/mkdirp/test/perm_sync.js
	node_modules/node-gyp/node_modules/mkdirp/test/race.js
	node_modules/node-gyp/node_modules/mkdirp/test/rel.js
	node_modules/node-gyp/node_modules/mkdirp/test/return.js
	node_modules/node-gyp/node_modules/mkdirp/test/return_sync.js
	node_modules/node-gyp/node_modules/mkdirp/test/root.js
	node_modules/node-gyp/node_modules/mkdirp/test/sync.js
	node_modules/node-gyp/node_modules/mkdirp/test/umask.js
	node_modules/node-gyp/node_modules/mkdirp/test/umask_sync.js
	node_modules/node-gyp/node_modules/nopt/.npmignore
	node_modules/node-gyp/node_modules/npmlog/node_modules/ansi/.npmignore
	node_modules/node-gyp/node_modules/request/node_modules/form-data/.travis.yml
	node_modules/node-gyp/node_modules/request/node_modules/form-data/node_modules/async/LICENSE
	node_modules/node-gyp/node_modules/request/node_modules/hawk/index.js
	node_modules/node-gyp/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml
	node_modules/node-gyp/node_modules/request/node_modules/http-signature/node_modules/asn1/LICENSE
	node_modules/node-gyp/node_modules/request/node_modules/mime/LICENSE
	node_modules/node-gyp/node_modules/request/node_modules/mime/README.md
	node_modules/node-gyp/node_modules/request/node_modules/mime/mime.js
	node_modules/node-gyp/node_modules/request/node_modules/mime/package.json
	node_modules/node-gyp/node_modules/request/node_modules/mime/test.js
	node_modules/node-gyp/node_modules/request/node_modules/mime/types/mime.types
	node_modules/node-gyp/node_modules/request/node_modules/mime/types/node.types
	node_modules/node-gyp/node_modules/request/node_modules/qs/.gitmodules
	node_modules/node-gyp/node_modules/request/node_modules/qs/.npmignore
	node_modules/node-gyp/node_modules/request/node_modules/qs/Readme.md
	node_modules/node-gyp/node_modules/request/node_modules/qs/index.js
	node_modules/node-gyp/node_modules/request/node_modules/qs/package.json
	node_modules/node-gyp/node_modules/tar/.travis.yml
	node_modules/socket.io/node_modules/socket.io-client/components/visionmedia-debug/debug.js
	node_modules/socket.io/node_modules/socket.io-client/components/visionmedia-debug/index.js