Tidy up spacing
Merge sharelatex-2014-11-12-1954 into master