Refactored scraper works
Merge remote-tracking branch 'origin/refactor/scraper' into refactor/scraper

Conflicts:
	app/models/admin.rb
	db/migrate/20130904031114_create_departments.rb
	db/migrate/20130904043228_add_dept_name_to_departments.rb