Merge pull request #1 from SeanMcKnight/master

Grab latest from master
Legend issue -- fixes #1
More legend issue -- fixes #1, maputil implementation fixes #3
Move data frame off figure, fixes #2
Figure numbers now assigned correctly, fixes #4

Before, periods were screwing up the figure numbers, now the regex pattern can handle them.
Merge pull request #7 from HEdingfield/master

Fixed 4 bugs!