simulator: clean up options for set-associative caches, do not use associativity as template argument
Merge branch 'master' of https://github.com/t-crest/patmos

Conflicts:
	simulator/include/command-line.h
	simulator/include/data-cache.h
	simulator/src/command-line.cc
	simulator/src/pasim.cc