Preparing to reorganize dev env.
Reorganizing dev environment
Merge branch 'jen' of walle:~/jairo into jen

Conflicts:
	node/jainode.js
Merge branch 'jen' of l3:~/jairo into jen