Merge remote-tracking branch 'origin/develop'
Moved root templates back into root
Update Todos.txt
Added better search and link result paragraph
Added Open Graph meta tag for link images
Added 256px logo for links
Deleted todos.txt. (finally migrated to github wiki)
Update readme.md
Merge branch 'master' into develop
ModelOnProbation date must be maually reset
Added fixtures for SectionTypes and DayOfWeeks
Added method stup for deleting old courses
Added "delete others" option for scraper configs
No more update_constants in scraper (fixtures instead)
Called code to clear old models from scraper view
Added old scraper reference code
YOU'RE AN IDIOT ok fixed it

had a stray colon in the scraper view file...
Merged in scraper updates