Replacing entire SD instance with code from Tim, from newer version of SD.  Probably needs to be properly merged/rebased at a later date, but I'm in a rush.
Adding new deployment system via Capistrano