Add test for preserving blank lines in a merge.
Normalize whitespace removes duplicate lines spaces, which is something that people need when using the HTML editor.  Instead of calling that, let's just trim the trailing white space. fixes #50
Merge pull request #81 from post-forking/bug-blank-lines

Fix blank lines being removed on merge