Change before/after annotations

Following up on the merge by @draculus - this makes it consistent so it
behaves like @depends annotations.  More than one @before/@after can be
used by adding additional @before/@after lines to docblock comments.
Fix documentation formatting

Fixing formatting (tabs inserted instead of spaces)
Merge pull request #1517 from zbateson/before-after-annotations-mod

Change before/after annotations