forgot to comment out mesif stuff in the CacheSimulator.h
Merge branch 'dd-141118'
trying to resolve conflict