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
Daily commit of work on widgets.
Merge branch 'jen' into david
Merge branch 'jen'
Merge branch 'david'