just tweaking a couple things
Merge branch 'master' of https://github.com/adamvail/drupal_modules
changed import
fixed merge conflict