Revert "Testing stuff"

This reverts commit 244d15fbc2836877ee8ebe9fecfdd51c77a72167.
Merge pull request #1 from cmortimer/Test-Branch

Revert "Testing stuff"