Various bug fixes
Fix BBL merging in zprof
Merge branch 'master' of github.com:jia-kai/zsim-profiling

Conflicts:
	misc/zprof.py