generalized setup script
Merge branch 'master' of github.com:groovehunter/drupal

Conflicts:
	setup_site.sh