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
Modified custom domain section of Readme. Resolves #46
Update to 3.6