remove OS X crap from git status listing
ignore *.bak files
Merge remote-tracking branch 'origin/master'