convert plain text in composer template to i18n
kill trailing whitespace in client.en.yml
Avoid grouping user stats by archetype (filter happens beforehand)
Don't count bookmark stats for users who can't see them
category stats shouldn't include deleted topics.
added 'flagged_by' i18n.
fixed guide download link
Improved action descriptions/links on user stream items
Correctly set the typeFilter when the user clicks "show more"
Request per_facet + 1 in search to know if we actually have more
Oneboxes shouldn't explode when the remote causes an HTTPError
Have oneboxer default to page title when og:title is missing
Fancy 404 should require access too
Update docs/VAGRANT.md

- added a subsection for Windows users on what they need to do in lieu of 'vagrant ssh' not working on the Win platform.
Merge pull request #189 from tms/get-off-my-lawn

Fancy 404 should require access too
Merge pull request #187 from tms/blog-onebox-tweaks

Have oneboxer default to page title when og:title is missing
Merge pull request #186 from tms/oneboxes-shouldnt-explode

Oneboxes shouldn't explode when the remote causes an HTTPError
Merge pull request #185 from tms/search-all-the-things

Search all the things
Merge pull request #184 from tms/activity-stream-tweaks

Improved action descriptions/links on user stream items
Merge pull request #182 from danneu/guide-typo

fixed guide download link