Fixes a nasty bug where a crash causes the .proto_dropbox file from
one directory to be copied into a subdirectory.
Merge branch 'master' of github.com:tobiasljohnson/proto_dropbox