Thrift-1984: namespace collision in python
Client: py
Patch: Jake Farrell

Updates fb303 to to be package thrift_fb303.
THRIFT-1968 Thrift's include path is wrong in pkg-config files
THRIFT-1552 fix include path => thrift/Thrift.h
add missing apt-get upgrade within .travis.yml
THRIFT-1981 Not all PHP libraries are installed when building an installing a debian package
Patch: Ricky Cormier
THRIFT-1985 add a Vagrantfile to build and test Apache Thrift fully reproducable
Merge ../thrift into trunk