Cleaning up avocado build.
Merge pull request #87 from fnothaft/cleanup-build

Cleaning up avocado build.