Merge pull request #271 from haitaoyao/master

fix for relative path of phoenix_jar_path and log4j.properties and hbase config
Phoenix#276, Phoenix#8
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
Merge pull request #277 from anoopsjohn/master

Support Distinct Count