added bixie collector with tests
Merge pull request #1302 from twobraids/bixie_collector

Fixes bug 867314: added bixie collector with tests
fixes bug 885085 -  bring install docs up to date with latest changes, plus vagrant optimizations and fixes
Merge pull request #1305 from rhelmer/bug885085-fix-and-optimize-install-docs-and-vagrant

fixes bug 885085 -  bring install docs up to date with latest changes, p...