Removed comments
Attempt to debug Tramp errors
renamed file
Merged latest