D7 1.x - addtional cleanup
Merge branch '7.x-1.x' of git.drupal.org:project/gratis into 7.x-1.x

Conflicts:
	README.txt