Change constant name of CountAggregateFunction to upper case COUNT
Merge branch 'master' of github.com:forcedotcom/phoenix
Bug fix for #275
Fix sqlline by upgrading to 1.1.2
Merge remote-tracking branch 'upstream/master'
Phoenix#8