use require.resolve to avoid node_module paths, and fix postinstall script
Merge branch 'dev' into iislucas-fix-npm-postinstall
fixed package name and tweaked comments
Merge pull request #109 from uProxy/iislucas-fix-npm-postinstall

require.resolve to avoid node_module paths, and fix postinstall script
fixed package deps; fixed .DS_store ignore
removed unused Gruntrule
updating Gruntfile for cca
Merge branch 'dev' into ryscheng-cordova

Conflicts:
	Gruntfile.coffee
Merge pull request #112 from uProxy/ryscheng-cordova

updating Gruntfile for cca
Merge pull request #111 from uProxy/iislucas-fix-baddeps

fixed package deps; fixed .DS_store ignore
rename socks module to socks-common
minor bump for new sample apps
Merge branch 'trevj-copypaste' into trevj-echoserver-fix
add a bunch of comments to the copypaste app
Merge branch 'dev' into trevj-copypaste

Conflicts:
	Gruntfile.coffee
Merge pull request #113 from uProxy/trevj-copypaste

add a SOCKS demo with a copy/paste-based signalling channel
Merge branch 'dev' into trevj-echoserver-fix