Modified diagnostics code to make it cleaner. Also moved VIM temp files to temp directory