Fix stuff so it actually runs on my machine...
Merge pull request #5 from rmtmckenzie/Morgan

Fix stuff so it actually runs on my machine...