bugfix, DS
Merge branch 'bootstrapping-iros' of github.com:rgleichman/rapprentice into bootstrapping-iros