Use subdir for files; drush make schema 1.2 without patch
Add features to makefile
Merge branch 'master' into test