Removing some of the assumptions about the environment to get this running on
other computers
Merge pull request #1 from notmyname/less-johnny

Removing some of the assumptions about the environment to get this runni...