Refactor, mostly #with_params

- refactored #with_params, seems easier to read now
- refactored #httpsql_valid_params, as simple as it used to be
- fixed odd transient failing test, because of travis
- fixed version typo
Merge pull request #5 from Adaptly/pc-refactor

Refactor, mostly #with_params