Revert "Merge pull request #17 from jamiebullock/master"

This reverts commit 5387dce0877dcfee9fa7cefd7ad615ca0e05324a, reversing
changes made to eabb1855777c8451c8a35bae4309ee112ac4460e.