Fix Drupal 7 migrations
Merge pull request #38 from erikwebb/master

Fix Drupal 7 migrations