Include recommended_links in total result count

Recommended links were originally excluded in this commit:
https://github.com/alphagov/frontend/commit/ba32f2c89abf714dfae6b5600ab9b243973414f2

It's not clear why this change was made, but we suspect the context was
different. In any case, it makes sense to us now to include the recommended
links in the total. It should also make refactoring this code easier.
Include recommended links in # mainstream result

Previously, if you had:
 * 1 recommended link result
 * 0 non-recommended link mainstream results
 * some government or detailed results

Then you would see the mainstream tab with "0" results, even though it did have
a recommended-link result.
Remove a long-redundant parameter

This was added to get results including the government tab, or artificial
inside gov results, but both of those features were enabled by default a long
time ago.
Merge pull request #322 from alphagov/some_cleanup

Some cleanup