Merge pull request #2 from esteigler/patch-1

Set attributes for included recipes using override instead of default
Lower the number of apache workers to support VM's with less memory
Merge branch 'master' of https://github.com/rjocoleman/vagrant_magento into downsize_memory

Conflicts:
	attributes/default.rb
Whitespace fixes and remove the call to restart apache right away, no need for this as far as I can tell
Don't populate the database with sample data if it already exists
Merge branch 'dont_always_import' into patch-1

Conflicts:
	recipes/default.rb