Remove references to Tag model from commands and remove Canddi-isms

Python doesn't allow the programmer to do variable assignment as part of an if condition ;)
Update Watson to my new branch
Skip search index updates in website module
Skip search index updates in queue module
Pull in fix for missing import in queue
Skip search index update for router

And stop saving the entire model when only flags have changed
More caching in website module

Also tested that cache misses aren't slower than no caching
Merge branch 'master' into deploy