Migrating to convict for managing configs. Fixes #14
Fixed merge conflicts, client-sessions and convict
Fixed up problems introduced while resolving merge conflicts
Merge pull request #39 from kparlante/master

Merge the convict PR