Adding Integration Test, fixing buildbot makefile

Adding Integration Test script, fixing buildbot makefile errors and
removing cruft.