Merge https://github.com/gregkh/bti

Conflicts:
	bti.1
	bti.c

Bring in all latest changes to the paulrho branch
Merge branch 'master' of https://github.com/paulrho/bti