typos found with vim
fix some more minor typos in remote section
merge conflict fixed.
Merge branch 'master' of github.com:jiffyclub/scipy-2013-git-testing