Getting vagrant up working, mostly
remove gunicorn_enabled and nginx_enabled

We should use roles to control these. If we are using chef-solo we can't
setup nginx because we don't have search capability. If that's the case
just default to using the application_server role.
Cleaned up the Vagrantfile
Merge branch 'master' into modcloth-cookbooks-vagrant-uppable

Conflicts:
	attributes/default.rb
Merge pull request #3 from ismell/modcloth-cookbooks-vagrant-uppable

Modcloth cookbooks vagrant uppable