Fixed all compilation errors (Except thrift related)
Merge branch 'master' of github.com:abhardwaj/barista