add current version of heimdal package
remove compile doc and fix remove conflicts (thanks to fsk141)
switch spaces to tabs to match