Revert "Merge pull request #1 from knotbeer/matt-local"
Merge pull request #3 from knotbeer/revert-2-master

Revert "Merge pull request #1 from knotbeer/matt-local"