Initial Search cleanup
Merge pull request #47 from jesseflorig/florigDev

Initial Search cleanup