Made minor modifications based on cevans87's CR.
Fixed a usability issue with grapevine.py.
Merge branch 'user/LoganEvans-structure' into user/LoganEvans-beaglebone