cleaned up naieve code in book_uploads, also increases count for duplicates
cleaned up some naieve code
removed commented out old code
resolving conflicts
Merge pull request #46 from cherimarie/merging_cleanup

Merging cleanup