Merge pull request #3 from adam-vessey/7.x

Drupal 7 port, for great justice!
Squash warning/not lie about the mapping being optional.