made things consistent to avoid breakage
Merge pull request #2 from ajpaulson/master

make settings more consistent to avoid breakages