removed plupload stuff and restored to where I should have committed last time