Merge pull request #59 from jhedstrom/code-cleanup

Code cleanup

Signed-off-by: Jonathan Hedstrom <jhedstrom@gmail.com>

Conflicts:
	src/Drupal/Drupal.php
	src/Drupal/DrupalExtension/config/drivers/drupal.yml