Dev

Including Travis test cases for both drush 7 and drush 6.