Merge pull request #379 from weese/hotfix/bs-tools

[FIX] Removed bs_tools warnings (master)
[FIX] added some missing defaults
Merge pull request #385 from weese/hotfix/snp-store

[FIX] snp_store - added some missing defaults (develop)