add .DS_Store files to .gitignore
replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0