Config for live site
New Wordpress build
Merge branch 'master' of https://github.com/aaronfrey/palmervolney into develop

Conflicts:
	wp-config.php