Makefile refactor
Merge branch 'masterTweak' of github.com:svenssonjoel/Obsidian into masterTweak

Conflicts:
	HSBencher