Move resque stub into test support
Wrap some assertions in ts_retry
Some cleanup, and add missing sphinx_spec
Cleanup
Revert "Some cleanup, and add missing sphinx_spec"

This reverts commit 72cedff8f78f53fc91fb123aaf25727fc0dbc57e.
Add missing sphinx_spec
Merge remote-tracking branch 'origin/master' into association-versioning
Update secretary-rails
Cleanup and add specs for outpost dashboard
Cleanup
Use strings instead of symbols for versioned_attributes
Add versioning for content alarms, plus specs