build-inst-ips now drops inst_ip rows on a per-institution basis before building new ones. add-inst-ips now takes argument 'manual' to add ip ranges manually added to var/inst_todo.txt
fixing ip range for open university (uk)
newIP now checks size of ip range, doesnt add if too big
fixing syntax errors in Inst
pri parser. put pri data in var/uploads/pdc/pri/ and run perl bin/bad-local/import-pdc.pl var/uploads/pdc/pri/
removing git versioned files from, moving some to assets/conf where necessary
added script to extract academic appointments from leiters blog, add to appointments table
misc
conflicts
merged