Merge branch '7.x' into 7.x-pimple
remove autoload.
remove changes to gitignore.
remove remaining differences from 7.x
Merge branch '7.x-pimple' into 7.x-symfony

Conflicts:
	.gitignore
	sites/all/drush/drushrc.php