Merge pull request #41 from dhawt/fix_scaled_positioning

Fix positioning for text and image layers.
Merge remote-tracking branch 'upstream/master'

his merge is necessary,
Minor cleanups in specs
Merge branch 'master' into paragraph_layers
Merge pull request #42 from dhawt/paragraph_layers

Add paragraph layers.