Moving to composer install for drush 7, and various other improvements