smart rspec script that uses spring (if available)
git command to merge upstream master into current branch