attempt at setup
added Boxfile config
Boxfile edit, added mysql
edit Boxfile
added phpmyadmin
phpmyadmin user
edit conDB
edited Boxfile
changed back API settings for google/facebok
getting this to work dammit!!
Pagodabox inital setup stuff

I added the boxfile for pagoda (config file), as well as PHPmyadmin for the site.

Conflicts:
	lib/credentials.php
Merge branch 'master' of git.pagodabox.com:circulate

Conflicts:
	lib/credentials.php
Merge branch 'master' of https://github.com/elizuck/circulate

Merged this branch with the Pagodabox settings for the new live environment.

You should a Boxfile added, as well as a myphpadmin folder
Changed settings for PHPmyadmin

Made it so you do need the credentials.
Changed lib/credentials.php siteInit.php to server settings

These were still set to the localhost settings, I changed them to reflect the new host.
Added lib/credentials.php to .gitignore

We don't want this mucking up the live server
Fixed search string per Zack

My last commit to master that ISNT server config.
Fixed Facebook logout issue.

credentials.php was still pointing to localhost
Changed the Boxfile

Added php_display_errors to 0, so they don't display.
Changed PHP settings

changed error reporting