Added units.js to _main, and modules. They contain proper unit definitions,unit test,  and unit adding methid
Merge branch 'master' into ssm_unitystuff

Conflicts:
	js/_main.js
	js/modules/units.js
Merge pull request #12 from felamaslen/ssm_unitystuff

Added units.js to _main, and modules. They contain proper unit definitio...