Update config/database.Site5.yml
Update config/database.yml.bak.github.yml
Update config/database.yml
Update Site Notes.txt
Update config/deploy.Site5.rb
Update config/deploy.original.rb
Update config/deploy.rb.turn2god
Update config/deploy.rb
completed merge
deleted a bunch of files
Merge branch 'master' of git://github.com/scervera/mdn