added the fancy image assertion back in
peace offering for Travis
Make watchdogs watchdog.
Merge pull request #387 from jordandukart/7.x-derivatives

Make watchdogs watchdog.
Document a feature of hooked access, due to hook invocation.
Merge pull request #388 from adam-vessey/7.x-fix-docs

Document a feature of hooked access, due to hook invocation.
Added ability to revert to previous versions of datastreams.
Fixed some small issues including improper comments, not returning properly, unnecessary code and putting the file in temporary:// for safety.
Removed unnecessary newlines.
Merge pull request #389 from christianselig/7.x

Added ability to revert to previous versions of datastreams.
Set global to prevent query logging when outputting datastreams.
Merge pull request #390 from adam-vessey/7.x-prevent-devel-query-log-issues

Set global to prevent query logging when outputting datastreams.
Added additional condition to prevent variable from being accessed when it hasn't been set.
Merge pull request #391 from christianselig/7.x

Added additional condition to prevent variable from being accessed when ...
Merge pull request #381 from qadan/7.x

added the fancy image assertion back in
resolved merge conflict