rebased master to upstream
Merge branch 'master' of github.com:predicativedotcom/rtbkit
Merge branch 'master' into predicative-dev