Fixes #383. Cleans up issues around connection strings and brings clarity
Merge pull request #405 from pencilblue/story/383

Fixes #383. Cleans up issues around connection strings and brings clarity