No more SQL
Merge branch '2.0' of github.com:picklesphp/pickles into 2.0