add swap files to .gitignore
add inclusion guards according to best practice