Adjusted some conflicts with Drupal 8.
Merge pull request #22 from mlabrecque/8.x-1.x

Adjusted some conflicts with Drupal 8.