Updated the tests to match the new location
Fixed sub-directory multi-site shortcode category pulling.
Bumping to 2.6.0
Merge branch 'develop'