Updated to ignore *.swp
Added in an elseif else statement