Update to 3.4.2
Merge pull request #24 from bikerm16/master

Update to Wordpress 3.4.2
Update to Wordpress 3.5
Added WP Read-Only plugin
Security update to Wordpress 3.5.1
Add Heroku Postgres settings (3.5.1 update)
replacing stray tabs with spaces, removing stray whitespace
explaining the step of needing to update unique keys and salts in wp-config.php
Merge pull request #34 from sevenadrian/warmfix/readme-salt-update

Warmfix/readme salt update
Fixes #36 by adding additional documentation to the README about how to setup MAMP and Postgres.
Merge pull request #37 from jaxzin/issue-36

Fixes #36 ...
Add instructions for Linux local dev environment setup to README
fix typos
Merge pull request #38 from ericgj/add-linux-setup-instructions

Add local setup instructions for linux, etc
upgrade to WP 3.5.2
restore config sample file, d'oh