Added disable-wordpress-*-update plugins, so you can disable update notification on heroku install
WP 3.7.1
Store credentials in Heroku environment variables instead of wp-config.php. Credentials should never be stored in code.
pg-ify multi-table deletes

(cherry picked from commit a51c1b39e613419669e739e70cd788d86f3d5137)
put brackets in the right place, genius

(cherry picked from commit 99acccbd60a3c7b2934e23fbaa4770908f0a5fff)
cast times

(cherry picked from commit b33aedb602ecb71d3f2f665f7731da55e71b6c46)
Merge branch 'store-keys-and-salts-in-env' of https://github.com/thecurator/wordpress-heroku into thecurator-store-keys-and-salts-in-env
Add HTTPS Plugin
Nav menu edit was blowing up
Merge branch 'add_https_plugin' of https://github.com/bigtiger/wordpress-heroku into bigtiger-add_https_plugin
Merge branch 'development' and 'master' of upstream + downstream(=fork) into dev

Conflicts:
	.gitignore
	wp-admin/css/colors-classic.min.css
	wp-admin/css/colors-fresh.min.css
	wp-admin/css/customize-controls-rtl.min.css
	wp-admin/css/customize-controls.min.css
	wp-admin/css/ie.min.css
	wp-admin/css/wp-admin-rtl.min.css
	wp-admin/css/wp-admin.min.css
	wp-admin/edit-form-advanced.php
	wp-admin/includes/schema.php
	wp-admin/includes/upgrade.php
	wp-admin/js/accordion.min.js
	wp-admin/js/color-picker.min.js
	wp-admin/js/common.min.js
	wp-admin/js/customize-controls.min.js
	wp-admin/js/editor.min.js
	wp-admin/js/inline-edit-post.min.js
	wp-admin/js/inline-edit-tax.min.js
	wp-admin/js/link.min.js
	wp-admin/js/nav-menu.min.js
	wp-admin/js/plugin-install.min.js
	wp-admin/js/post.min.js
	wp-admin/js/revisions.min.js
	wp-admin/js/tags.min.js
	wp-admin/js/theme.min.js
	wp-config.php
	wp-content/languages/de_DE/themes/twentythirteen-de_DE.po
	wp-content/plugins/disable-wordpress-core-update/disable-core-update.php
	wp-content/plugins/disable-wordpress-core-update/readme.txt
	wp-content/themes/twentythirteen/404.php
	wp-content/themes/twentythirteen/archive.php
	wp-content/themes/twentythirteen/author-bio.php
	wp-content/themes/twentythirteen/author.php
	wp-content/themes/twentythirteen/category.php
	wp-content/themes/twentythirteen/comments.php
	wp-content/themes/twentythirteen/content-aside.php
	wp-content/themes/twentythirteen/content-audio.php
	wp-content/themes/twentythirteen/content-chat.php
	wp-content/themes/twentythirteen/content-gallery.php
	wp-content/themes/twentythirteen/content-image.php
	wp-content/themes/twentythirteen/content-link.php
	wp-content/themes/twentythirteen/content-none.php
	wp-content/themes/twentythirteen/content-quote.php
	wp-content/themes/twentythirteen/content-status.php
	wp-content/themes/twentythirteen/content-video.php
	wp-content/themes/twentythirteen/content.php
	wp-content/themes/twentythirteen/footer.php
	wp-content/themes/twentythirteen/functions.php
	wp-content/themes/twentythirteen/header.php
	wp-content/themes/twentythirteen/image.php
	wp-content/themes/twentythirteen/inc/back-compat.php
	wp-content/themes/twentythirteen/inc/custom-header.php
	wp-content/themes/twentythirteen/index.php
	wp-content/themes/twentythirteen/page.php
	wp-content/themes/twentythirteen/search.php
	wp-content/themes/twentythirteen/sidebar-main.php
	wp-content/themes/twentythirteen/sidebar.php
	wp-content/themes/twentythirteen/single.php
	wp-content/themes/twentythirteen/style.css
	wp-content/themes/twentythirteen/tag.php
	wp-content/themes/twentythirteen/taxonomy-post_format.php
	wp-content/themes/twentytwelve/404.php
	wp-content/themes/twentytwelve/archive.php
	wp-content/themes/twentytwelve/author.php
	wp-content/themes/twentytwelve/category.php
	wp-content/themes/twentytwelve/comments.php
	wp-content/themes/twentytwelve/content-none.php
	wp-content/themes/twentytwelve/content-status.php
	wp-content/themes/twentytwelve/content.php
	wp-content/themes/twentytwelve/css/ie.css
	wp-content/themes/twentytwelve/footer.php
	wp-content/themes/twentytwelve/functions.php
	wp-content/themes/twentytwelve/header.php
	wp-content/themes/twentytwelve/image.php
	wp-content/themes/twentytwelve/inc/custom-header.php
	wp-content/themes/twentytwelve/index.php
	wp-content/themes/twentytwelve/languages/twentytwelve.pot
	wp-content/themes/twentytwelve/page.php
	wp-content/themes/twentytwelve/search.php
	wp-content/themes/twentytwelve/sidebar-front.php
	wp-content/themes/twentytwelve/sidebar.php
	wp-content/themes/twentytwelve/single.php
	wp-content/themes/twentytwelve/style.css
	wp-content/themes/twentytwelve/tag.php
	wp-includes/class-wp-image-editor-gd.php
	wp-includes/class-wp-image-editor-imagick.php
	wp-includes/class-wp-image-editor.php
	wp-includes/css/admin-bar.min.css
	wp-includes/css/editor.min.css
	wp-includes/css/jquery-ui-dialog.min.css
	wp-includes/css/media-views-rtl.min.css
	wp-includes/js/admin-bar.min.js
	wp-includes/js/autosave.min.js
	wp-includes/js/heartbeat.min.js
	wp-includes/js/hoverIntent.min.js
	wp-includes/js/media-editor.min.js
	wp-includes/js/media-models.min.js
	wp-includes/js/media-views.min.js
	wp-includes/js/quicktags.min.js
	wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js
	wp-includes/js/wp-auth-check.min.js
	wp-includes/js/wp-backbone.min.js
	wp-includes/js/wp-util.min.js
	wp-includes/js/wplink.min.js
	wp-includes/post.php