Remove commented code
Update base
Merge branch 'master' of github.com:tmn/frbr-node

Conflicts:
	lib/app.js