Merge pull request #85 from christriddle/cat

Multi-toggles! Massive PR - sorry
Merge branch 'master' of github.com:opentable/hobknob into cat