Fix placement of paint text

Box text still has some issues
More subtle fixes to text positioning.
Remove spurious left margin correction
Merge pull request #217 from adobe-photoshop/jp/textpos

More fixes for text positioning, in particular "box" text.
Merge remote-tracking branch 'upstream/master'