Merge branch 'gh-pages'
table fieldtype

Am I handling the variable section correctly/consistently here?
file fieldtype update
replicator fieldtype replicator fieldtype replicator fieldtype
watermark to transform
deprecated entries:map; adding location:map_url

Are there more options with map_url?
Merge pull request #39 from pmeissner/patch-22

deprecated entries:map; adding location:map_url
Merge pull request #38 from pmeissner/patch-21

watermark to transform
Merge pull request #36 from pmeissner/patch-19

replicator fieldtype replicator fieldtype replicator fieldtype
Merge pull request #35 from pmeissner/patch-18

file fieldtype update
Merge pull request #34 from pmeissner/patch-17

table fieldtype
Merge branch 'master' into gh-pages