Added support for configuring Kerberos authentication
Fix minor conflicts
Fix incorrect tab
More cosmetic fixes to the README