Return to Sorcery

Please accept this attempt to revert back to Sorcery, plus the additional changes we made to change to postgresql when developing on our local machines.  Thanks!