Merge pull request #231 from garyburd/master

Improve handling of vendored packages, fix issues