Finishes dropbox.yml
Fixed Merge Conflict

There was a conflict with duplicate migrations. This has been fixed.
Performed the fixed merge and updated schema
Merge branch 'master' of https://github.com/Chps/Pyc

Conflicts:
	db/schema.rb
Randomized the uploaded file names

This will prevent two like-named files from overwriting.