Add ability to pass s argument

Also contains the fixes of https://github.com/ericandrewlewis/WP_Query_Multisite/pull/8 so close one or another :)