Merge branch 'master' into gen2

Makefile

@@ -16,6 +16,7 @@ node_modules:
 	npm install
 
 
+# XXX is this a good idea???
 dev: node_modules
 	cp $</ig-object/object.js lib/
 	cp $</ig-actions/actions.js lib/

scripts/bootstrap.js

@@ -47,6 +47,9 @@ glob('bootstrap/**/*.@(tpl|md|css|html)')
 			+'all changes made here will be lost.'
 			+'\n\n'
 			+'var Bootstrap = ' + JSON.stringify(bootstrap)
+			+'\n\n'
+			+'typeof(module) != "undefined" \n'
+			+'	&& (module.exports = Bootstrap)'
 
 		console.log('Writing:', 'bootstrap.js')
 		fs.writeFileSync('bootstrap.js', txt) })

ui.js

@@ -6,9 +6,6 @@
 
 var requirejs_cfg = {
 	paths: {
-		// XXX one approach to avoid at least this section is to copy the
-		// 		modules to lib/*, this way we'll need the map section below
-		// 		only...	(without automation this also sounds bad)
 		'lib/object': [
 			'./node_modules/ig-object/object',
 			'./lib/object',
@@ -51,4 +48,4 @@ var pwiki = require('pwiki')
 
 
 /**********************************************************************
-* vim:set ts=4 sw=4 :                               */ return module })
+* vim:set ts=4 sw=4 nowrap :                        */ return module })