Merge pull request #14 from robotpony/master

Merging any changes into DSL for pull back into ROBO
This undoes one change made to the robotpony/Presto source on master. The vast majority of the differences between the two repos (on the master branches) represent cleanup only. This one change stands out as having caused problems with v1.0 functionality. I am submitting it as a candidate for patching master in robotpony repo.
Merge pull request #39 from Discovery-Software/robotpony-merge

Robotpony merge
Merge pull request #41 from robotpony/dsl-merge

Dsl merge