hopefully merge issues fixed
Merge pull request #100 from LandonVance/settingsfix

hopefully merge issues fixed
fixing more merge issues