Rewrite herokuapp.com url to stop duplicate content
Update akismet to 2.5.9
Update cloudflare to 1.3.10
Update contact-form-7 to 3.5.3
Update to latest wpro with Gravity Forms support, from https://github.com/frc/wpro
Disable automatic updates that are on by default for minor releases in WP 3.7. Updates won't survive restarting and scaling dynos
Disable X-Powered-By: PHP/5.x.xx header
Merge pull request #10 from okko/disable-auto-updates-for-upstream

Disable automatic updates since those updates won't survive restarting and scaling dynos.
Merge pull request #8 from dlackty/update-plugins

Update akismet to 2.5.9, cloudflare to 1.3.10, contact-form-7 to 3.5.3. Thanks @dlackty
Merge pull request #7 from skeet/patch-1

Configuration example on how to redirect herokuapp.com to a domain. Commented out by default.
Merge pull request #12 from okko/expose_php_off-for-upstream

Disable X-Powered-By: PHP/5.x.xx header
Merge pull request #9 from okko/wpro-with-gravity-forms-support-for-upstream

Update to latest wpro plugin version with Gravity Forms support
Merge branch 'master' of github.com:mchung/wordpress-on-heroku into update_from_upstream