Don't run sidekiq as root
sidekiq bin no longer needs to be a template
Support altering the collectd swap alerts
Merge pull request #138 from ches/run-sidekiq-as-app-user

Don't run sidekiq as root
Merge pull request #145 from engineyard/collectd-swap-alerts

Support altering the collectd swap alerts
Added magento cookbook without redis for cc-667
Added magento_redis to ey-cloud-recipes
Update ReadMe.md

Updated Title
Update ReadMe.md

Cleaned up the formatting of the readme.
Update ReadMe.md

Made a more verbose heading
Merge pull request #160 from engineyard/CC-668

CC-668
Merge pull request #159 from engineyard/CC-667

Added magento cookbook without redis for CC-667
combined magento and magento_redis cookbooks, refactored magento cookbook to dynamically pull app names, added redis session store and page caching support
removed solr file from last commit, my bad
add solr file back in
[CC-675] Logrotate explicit about config permissions
Merge pull request #163 from engineyard/CC-675

[CC-675] Logrotate explicit about config permissions
Merge pull request #161 from engineyard/CC-674

Re-factor Magento
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cookbooks/sidekiq/files/default/sidekiq
Merge branch 'master' into server/haeproduction