static: use relpath in head.html
test: tweak structure in test environment
markup: fix head.html bug
add should.js and sinon.js
Housekeeping
using mocha/shouldjs/sinon as node_module deps
fix conflicts
markup: remove conficts
change gitignore
Merge branch 'fix/test-build'

Conflicts:
	.gitignore
Some massaging