Update to 3.6.1
added information for importing heroku postgres db into local dev. added dump files to gitignore
added comments to gitignore
added local development logic (local DB, local siteurl, gitignore db dump)

Conflicts:

	.gitignore
	wp-config.php
added heroku import/restore chapter
added s3 delete command to cleanup and remove db dump after restore
Moved a few README sections to wiki
Small fixes to readme.md
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