deps
Merge branch 'master' into steve

Conflicts:
	etc/dependencies.txt
fixed bug with bibtex rendering: editors for chapters in collections are now displayed
fixed spreadsheet url processing bug. also ignores example entries
trying to get batch upload to handle spreadsheets. the temp file that is created looks just like the xls uploaded, but is not being processed. i can run the original file directly through bin/harvest/import-spreadsheet, but not the tmp file created
added bin/operations/massmove.pl for to move uncategorized entries from a particular cat and in particular journals to another category. uses massMoveUnCat in xPapers::Cat
preliminary changes to merge journals to pre compute fuzzy matches
merged master fixed conflict with MergeJournals.pm
institution url resolver and proxy now shows up if you are not logged in, but connecting on campus
more changes to merge journals, support for uploading spreadsheets on web
mass move script
fixing merge conflicts
fixing merge conflicts
merge journals script ready to be run on main server. run bin/dev/merge-journals.pl with no arguents to precompute fuzzy matches, or pass it a journal id
fixed small bug with merge journals
resources for matching ips to non subscribing insts from ipligence table. use bin/dev/build-inst-ips.pl to build the inst_ips table.
files for inst_ip building
small change to inst-ips script
small change
added argument support for build-inst-ips.pl. use 'manual' for manual mode, 'redo' to redo too big or too small cases, 'problem' to redo cases where inst has too many users but no ips matched, and 'report' to generate a report of insts that need attention