simplify
Merge branch 'master' of github.com:cambridgehackers/xbsv
added guard in case namespace.make is not defined