Google Maps block canvas height & width

Added the ability to specify the height and width for the map canvas
within the bundled Google Maps block. The defaults I have set match the
current dimensions so as not to cause any breakages on upgrading.
Merge branch 'google-maps-update-wip' into google-maps-update-dimensions-wip
fixing conflict and adding upgrade