Merge bierman02-auth and bierman02-base features