fixed some weird indentation issues
Merge branch 'master' of https://github.com/josephg/ShareJS