Merge pull request #3 from mathewc/master

Moving test settings to config/environment settings