fix move on 404 or directory
fix merge conflicts
Merge pull request #186 from pantheon-systems/fix-move

Fix move; 404 improperly handled; now also better detects error when moving a directory
Merge pull request #187 from pantheon-systems/master

Capture error when moving directories