updates for on-box
updates to support on-box python
Merge remote-tracking branch 'juniper/master' into onbox
Merge pull request #204 from jeremyschulman/onbox

Add support for future-onbox python