Starting new refactor.
Merge branch 'master' of github.com:cyberswat/drupal

Conflicts:
	recipes/default.rb