Fixes and updates for non-FileSystem providers
Merge to Master
Merge pull request #23 from chrisbenti/provider

Fixes the prompt line for non-FileSystem poviders