Fix some minor typos
Merge sharelatex-2014-11-12-1733 into master