formatting in notes now works;
Merge remote-tracking branch 'upstream/master' into feat_notes
progress on markup issue
should properly escape &nbsp; in xml now
Merge pull request #19 from subtitle/feat_notes

Notes formatting fix