Merge pull request #18 from ExperienceOrb/David's-Branch

Merge pull request #17 from ExperienceOrb/master
Reverted to more stable build
Merge pull request #19 from ExperienceOrb/Kyle's-Branch

Reverted to more stable build
Merge pull request #20 from ExperienceOrb/master

Trying to fix david