Update directory parameters and department aliases for Fall 2014.
Fix merge conflicts in scraper on master.