updated make file with latest prefered modules. Changed default structure to be more readable and to include some drush 6 features.