exclude VI swap files (.*.swp)
fix Jalopy error detection and log Jalopy warnings
Update from upstream