Merge Matt's highlight follow mode fixes and fix conflicts. Fix user_dir. Remove debugging print statements.