Security update to Wordpress 3.5.1
Add Heroku Postgres settings (3.5.1 update)
Useful.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wp-config-sample.php
	wp-content/themes/twentyeleven/languages/twentyeleven.pot
	wp-content/themes/twentytwelve/languages/twentytwelve.pot