Spelling fixes.
Fix bad conflict resolution
Tweak whitespace for clarity
Merge pull request #800 from marcandre/typos

Typos