Subtree merge pivotal_workstation

* So history is preserved in sprout
* See: https://help.github.com/articles/working-with-subtree-merge